Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/uname.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/coreutils/uname.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/coreutils/uname.c

@@ -3 +3 @@
  * Copyright (C) 1989-1999 Free Software Foundation, Inc.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -10 +10 @@
 
 /* Option       Example
-
-   -s, --sysname    SunOS
-   -n, --nodename   rocky8
-   -r, --release    4.0
-   -v, --version
-   -m, --machine    sun
-   -a, --all        SunOS rocky8 4.0  sun
-
-   The default behavior is equivalent to `-s'.
-
-   David MacKenzie <djm@gnu.ai.mit.edu> */
-
-/* Busyboxed by Erik Andersen */
-
-/* Further size reductions by Glenn McGrath and Manuel Novoa III. */
-
-/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ * -s, --sysname    SunOS
+ * -n, --nodename   rocky8
+ * -r, --release    4.0
+ * -v, --version
+ * -m, --machine    sun
+ * -a, --all        SunOS rocky8 4.0  sun
  *
- * Now does proper error checking on i/o.  Plus some further space savings.
+ * The default behavior is equivalent to '-s'.
+ *
+ * David MacKenzie <djm@gnu.ai.mit.edu>
+ *
+ * GNU coreutils 6.10:
+ * Option:                      struct   Example(s):
+ *                              utsname
+ *                              field:
+ * -s, --kernel-name            sysname  Linux
+ * -n, --nodename               nodename localhost.localdomain
+ * -r, --kernel-release         release  2.6.29
+ * -v, --kernel-version         version  #1 SMP Sun Jan 11 20:52:37 EST 2009
+ * -m, --machine                machine  x86_64   i686
+ * -p, --processor              (none)   x86_64   i686
+ * -i, --hardware-platform      (none)   x86_64   i386
+ *      NB: vanilla coreutils reports "unknown" -p and -i,
+ *      x86_64 and i686/i386 shown above are Fedora's inventions.
+ * -o, --operating-system       (none)   GNU/Linux
+ * -a, --all: all of the above, in the order shown.
+ *      If -p or -i is not known, don't show them
  */
 
+/* Busyboxed by Erik Andersen
+ *
+ * Before 2003: Glenn McGrath and Manuel Novoa III
+ *  Further size reductions.
+ * Mar 16, 2003: Manuel Novoa III (mjn3@codepoet.org)
+ *  Now does proper error checking on i/o.  Plus some further space savings.
+ * Jan 2009:
+ *  Fix handling of -a to not print "unknown", add -o and -i support.
+ */
+
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
-#include "libbb.h"
 
 typedef struct {
     struct utsname name;
-    char processor[8];          /* for "unknown" */
+    char processor[sizeof(((struct utsname*)NULL)->machine)];
+    char platform[sizeof(((struct utsname*)NULL)->machine)];
+    char os[sizeof("GNU/Linux")];
 } uname_info_t;
 
-static const char options[] ALIGN1 = "snrvmpa";
-static const unsigned short utsname_offset[] ALIGN2 = {
-    offsetof(uname_info_t,name.sysname),
-    offsetof(uname_info_t,name.nodename),
-    offsetof(uname_info_t,name.release),
-    offsetof(uname_info_t,name.version),
-    offsetof(uname_info_t,name.machine),
-    offsetof(uname_info_t,processor)
+static const char options[] ALIGN1 = "snrvmpioa";
+static const unsigned short utsname_offset[] = {
+    offsetof(uname_info_t, name.sysname), /* -s */
+    offsetof(uname_info_t, name.nodename), /* -n */
+    offsetof(uname_info_t, name.release), /* -r */
+    offsetof(uname_info_t, name.version), /* -v */
+    offsetof(uname_info_t, name.machine), /* -m */
+    offsetof(uname_info_t, processor), /* -p */
+    offsetof(uname_info_t, platform), /* -i */
+    offsetof(uname_info_t, os), /* -o */
 };
 
-int uname_main(int argc, char **argv);
-int uname_main(int argc, char **argv)
+int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int uname_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_LONG_OPTS
+    static const char uname_longopts[] ALIGN1 =
+        /* name, has_arg, val */
+        "all\0"               No_argument       "a"
+        "kernel-name\0"       No_argument       "s"
+        "nodename\0"          No_argument       "n"
+        "kernel-release\0"    No_argument       "r"
+        "release\0"           No_argument       "r"
+        "kernel-version\0"    No_argument       "v"
+        "machine\0"           No_argument       "m"
+        "processor\0"         No_argument       "p"
+        "hardware-platform\0" No_argument       "i"
+        "operating-system\0"  No_argument       "o"
+    ;
+#endif
     uname_info_t uname_info;
 #if defined(__sparc__) && defined(__linux__)
     char *fake_sparc = getenv("FAKE_SPARC");
 #endif
-    const unsigned short int *delta;
-    char toprint;
+    const char *unknown_str = "unknown";
+    const char *fmt;
+    const unsigned short *delta;
+    unsigned toprint;
 
+    IF_LONG_OPTS(applet_long_options = uname_longopts);
     toprint = getopt32(argv, options);
 
-    if (argc != optind) {
+    if (argv[optind]) { /* coreutils-6.9 compat */
         bb_show_usage();
     }
 
-    if (toprint & (1 << 6)) {
-        toprint = 0x3f;
+    if (toprint & (1 << 8)) { /* -a => all opts on */
+        toprint = (1 << 8) - 1;
+        unknown_str = ""; /* -a does not print unknown fields */
     }
 
-    if (toprint == 0) {
-        toprint = 1;            /* sysname */
+    if (toprint == 0) { /* no opts => -s (sysname) */
+        toprint = 1;
     }
 
-    if (uname(&uname_info.name) == -1) {
-        bb_error_msg_and_die("cannot get system name");
-    }
+    uname(&uname_info.name); /* never fails */
 
 #if defined(__sparc__) && defined(__linux__)
-    if ((fake_sparc != NULL)
-        && ((fake_sparc[0] == 'y')
-            || (fake_sparc[0] == 'Y'))) {
+    if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') {
         strcpy(uname_info.name.machine, "sparc");
     }
 #endif
-
-    strcpy(uname_info.processor, "unknown");
+    strcpy(uname_info.processor, unknown_str);
+    strcpy(uname_info.platform, unknown_str);
+    strcpy(uname_info.os, "GNU/Linux");
+#if 0
+    /* Fedora does something like this */
+    strcpy(uname_info.processor, uname_info.name.machine);
+    strcpy(uname_info.platform, uname_info.name.machine);
+    if (uname_info.platform[0] == 'i'
+     && uname_info.platform[1]
+     && uname_info.platform[2] == '8'
+     && uname_info.platform[3] == '6'
+    ) {
+        uname_info.platform[1] = '3';
+    }
+#endif
 
     delta = utsname_offset;
+    fmt = " %s" + 1;
     do {
         if (toprint & 1) {
-            printf(((char *)(&uname_info)) + *delta);
-            if (toprint > 1) {
-                putchar(' ');
+            const char *p = (char *)(&uname_info) + *delta;
+            if (p[0]) {
+                printf(fmt, p);
+                fmt = " %s";
             }
         }
         ++delta;
     } while (toprint >>= 1);
-    putchar('\n');
+    bb_putchar('\n');
 
-    fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
 }