[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 7949a9145a3b60134fb6364c4db23a61d8aa000f

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  7949a9145a3b60134fb6364c4db23a61d8aa000f (commit)
      from  500e78779fd6b32082d2a0e096e1c30e24146996 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7949a9145a3b60134fb6364c4db23a61d8aa000f
Author: Joe Ciccone <jciccone at gmail.com>
Date:   Sat Jan 8 22:00:30 2011 -0500

    Updated the Multiarch Wrapper based on changes from DX-MON.

diff --git a/BOOK/final-system/multilib/multiarch_wrapper.xml b/BOOK/final-system/multilib/multiarch_wrapper.xml
index 11a2697..b2f6676 100644
--- a/BOOK/final-system/multilib/multiarch_wrapper.xml
+++ b/BOOK/final-system/multilib/multiarch_wrapper.xml
@@ -61,21 +61,17 @@ int main(int argc, char **argv)
   if (pid == 0) {
     execvp(filename, argv);
     perror(filename);
-    goto end;
   } else if (pid < 0) {
-    goto end_error;
+    perror(argv[0]);
   } else {
     if (waitpid(pid, &status, 0) != pid) {
       status = EXIT_FAILURE;
-      goto end_error;
+      perror(argv[0]);
+    } else {
+      status = WEXITSTATUS(status);
     }
-    status = WEXITSTATUS(status);
   }
-  goto end;
 
-end_error:
-  perror(argv[0]);
-end:
   free(filename);
 
   return status;
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index fe24f52..7fd5e4b 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -41,6 +41,10 @@
       <para>January 8, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[jciccone] - Updated the Multiarch Wrapper based on changes
+          from DX-MON.</para>
+        </listitem>
+        <listitem>
           <para>[jciccone] - Updated Bootscripts to 1.2-pre11.</para>
         </listitem>
         <listitem>

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/multilib/multiarch_wrapper.xml |   12 ++++--------
 BOOK/introduction/common/changelog.xml           |    4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book