Merge branch 'busybox' into merge

1 files changed, 5 insertions, 6 deletions

diff --git a/coreutils/uname.c b/coreutils/uname.c
index aad58cab0..bb2d1fe8d 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -63,9 +63,9 @@
 //config:       help
 //config:       Same as uname -m.
 
-//applet:IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP))
-//                  APPLET_ODDNAME:name  main   location    suid_type     help
-//applet:IF_BB_ARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch))
+//                  APPLET_NOFORK:name   main   location    suid_type     help
+//applet:IF_UNAME(APPLET_NOFORK(  uname, uname, BB_DIR_BIN, BB_SUID_DROP, uname))
+//applet:IF_BB_ARCH(APPLET_NOFORK(arch,  uname, BB_DIR_BIN, BB_SUID_DROP, arch))
 
 //kbuild:lib-$(CONFIG_UNAME)   += uname.o
 //kbuild:lib-$(CONFIG_BB_ARCH) += uname.o
@@ -147,8 +147,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         "operating-system\0"  No_argument       "o"
                 ;
 # endif
-                IF_LONG_OPTS(applet_long_options = uname_longopts);
-                toprint = getopt32(argv, options);
+                toprint = getopt32long(argv, options, uname_longopts);
                 if (argv[optind]) { /* coreutils-6.9 compat */
                         bb_show_usage();
                 }
@@ -183,7 +182,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 strcpy(uname_info.processor, unknown_str);
                 strcpy(uname_info.platform, unknown_str);
                 strcpy(uname_info.os, CONFIG_UNAME_OSNAME);
-# if 0
+# if ENABLE_FEDORA_COMPAT
                 /* Fedora does something like this */
                 strcpy(uname_info.processor, uname_info.name.machine);
                 strcpy(uname_info.platform, uname_info.name.machine);