Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/setarch.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/setarch.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/util-linux/setarch.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Linux32/linux64 allows for changing uname emulation.
+ * linux32/linux64 allows for changing uname emulation.
  *
  * Copyright 2002 Andi Kleen, SuSE Labs.
  *
- * Licensed under GPL v2 or later, see file License for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 
@@ -12 +12 @@
 #include "libbb.h"
 
-int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv);
-int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setarch_main(int argc UNUSED_PARAM, char **argv)
 {
-    int pers = -1;
+    int pers;
 
     /* Figure out what personality we are supposed to switch to ...
      * we can be invoked as either:
-     * argv[0],argv[1] -> "setarch","personality"
-     * argv[0]         -> "personality"
+     * argv[0],argv[1] == "setarch","personality"
+     * argv[0]         == "personality"
      */
-retry:
-    if (argv[0][5] == '6') /* linux64 */
+    if (ENABLE_SETARCH && applet_name[0] == 's'
+     && argv[1] && strncpy(argv[1], "linux", 5)
+    ) {
+        applet_name = argv[1];
+        argv++;
+    }
+    if (applet_name[5] == '6') /* linux64 */
         pers = PER_LINUX;
-    else if (argv[0][5] == '3') /* linux32 */
+    else if (applet_name[5] == '3') /* linux32 */
         pers = PER_LINUX32;
-    else if (pers == -1 && argv[1] != NULL) {
-        pers = PER_LINUX32;
-        ++argv;
-        goto retry;
-    }
+    else
+        bb_show_usage();
 
-    /* make user actually gave us something to do */
-    ++argv;
+    argv++;
     if (argv[0] == NULL)
         bb_show_usage();
@@ -40 +41 @@
     /* Try to set personality */
     if (personality(pers) >= 0) {
-
         /* Try to execute the program */
         BB_EXECVP(argv[0], argv);
     }
 
-    bb_perror_msg_and_die("%s", argv[0]);
+    bb_simple_perror_msg_and_die(argv[0]);
 }