Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/uname.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/uname.c (modified) (4 diffs)

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

@@ -50 +50 @@
 
 //usage:#define uname_trivial_usage
-//usage:       "[-amnrspv]"
+//usage:       "[-amnrspvio]"
 //usage:#define uname_full_usage "\n\n"
 //usage:       "Print system information\n"
@@ -56 +56 @@
 //usage:     "\n    -m  The machine (hardware) type"
 //usage:     "\n    -n  Hostname"
-//usage:     "\n    -r  OS release"
-//usage:     "\n    -s  OS name (default)"
+//usage:     "\n    -r  Kernel release"
+//usage:     "\n    -s  Kernel name (default)"
 //usage:     "\n    -p  Processor type"
-//usage:     "\n    -v  OS version"
+//usage:     "\n    -v  Kernel version"
+//usage:     "\n    -i  The hardware platform"
+//usage:     "\n    -o  OS name"
 //usage:
 //usage:#define uname_example_usage
@@ -73 +75 @@
     char processor[sizeof(((struct utsname*)NULL)->machine)];
     char platform[sizeof(((struct utsname*)NULL)->machine)];
-    char os[sizeof("GNU/Linux")];
+    char os[sizeof(CONFIG_UNAME_OSNAME)];
 } uname_info_t;
 
@@ -140 +142 @@
     strcpy(uname_info.processor, unknown_str);
     strcpy(uname_info.platform, unknown_str);
-    strcpy(uname_info.os, "GNU/Linux");
+    strcpy(uname_info.os, CONFIG_UNAME_OSNAME);
 #if 0
     /* Fedora does something like this */