Merge branch 'busybox' into mergeFRP

4 files changed, 13 insertions, 22 deletions

diff --git a/coreutils/false.c b/coreutils/false.c
index 59c2f321a..0591a6cdc 100644
--- a/coreutils/false.c
+++ b/coreutils/false.c
@@ -10,11 +10,9 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/000095399/utilities/false.html */
 
-//usage:#define false_trivial_usage
-//usage:       ""
-//usage:#define false_full_usage "\n\n"
-//usage:       "Return an exit code of FALSE (1)"
-//usage:
+/* "false --help" is special-cased to ignore --help */
+//usage:#define false_trivial_usage NOUSAGE_STR
+//usage:#define false_full_usage ""
 //usage:#define false_example_usage
 //usage:       "$ false\n"
 //usage:       "$ echo $?\n"
diff --git a/coreutils/test.c b/coreutils/test.c
index 9e709a709..422d24c54 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -39,14 +39,9 @@
 //config:       help
 //config:         Enable 64-bit support in test.
 
-/* "test --help" does not print help (POSIX compat), only "[ --help" does.
- * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION")
- * Unfortunately, it screws up generated BusyBox.html. TODO. */
-//usage:#define test_trivial_usage
-//usage:       "EXPRESSION ]"
-//usage:#define test_full_usage "\n\n"
-//usage:       "Check file types, compare values etc. Return a 0/1 exit code\n"
-//usage:       "depending on logical value of EXPRESSION"
+/* "test --help" is special-cased to ignore --help */
+//usage:#define test_trivial_usage NOUSAGE_STR
+//usage:#define test_full_usage ""
 //usage:
 //usage:#define test_example_usage
 //usage:       "$ test 1 -eq 2\n"
diff --git a/coreutils/true.c b/coreutils/true.c
index 382e476a8..89f892961 100644
--- a/coreutils/true.c
+++ b/coreutils/true.c
@@ -10,11 +10,9 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */
 
-//usage:#define true_trivial_usage
-//usage:       ""
-//usage:#define true_full_usage "\n\n"
-//usage:       "Return an exit code of TRUE (0)"
-//usage:
+/* "true --help" is special-cased to ignore --help */
+//usage:#define true_trivial_usage NOUSAGE_STR
+//usage:#define true_full_usage ""
 //usage:#define true_example_usage
 //usage:       "$ true\n"
 //usage:       "$ echo $?\n"
diff --git a/coreutils/who.c b/coreutils/who.c
index f955ce6d3..8337212c9 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -73,7 +73,7 @@ static void idle_string(char *str6, time_t t)
 int who_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int who_main(int argc UNUSED_PARAM, char **argv)
 {
-        struct utmp *ut;
+        struct utmpx *ut;
         unsigned opt;
         int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
         const char *fmt = "%s";
@@ -83,8 +83,8 @@ int who_main(int argc UNUSED_PARAM, char **argv)
         if (opt & 2) // -H
                 printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n");
 
-        setutent();
-        while ((ut = getutent()) != NULL) {
+        setutxent();
+        while ((ut = getutxent()) != NULL) {
                 if (ut->ut_user[0]
                  && ((opt & 1) || ut->ut_type == USER_PROCESS)
                 ) {
@@ -126,6 +126,6 @@ int who_main(int argc UNUSED_PARAM, char **argv)
         if (do_users)
                 bb_putchar('\n');
         if (ENABLE_FEATURE_CLEAN_UP)
-                endutent();
+                endutxent();
         return EXIT_SUCCESS;
 }