Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

7 files changed, 125 insertions, 111 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index dcb5add8f..cff2ce216 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -728,13 +728,6 @@ config FEATURE_WC_LARGE
         help
           Use "unsigned long long" in wc for counter variables.
 
-config WHO
-        bool "who"
-        default y
-        depends on FEATURE_UTMP
-        help
-          who is used to show who is logged on.
-
 config WHOAMI
         bool "whoami"
         default y
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 0681e44b0..53d88b391 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -82,6 +82,5 @@ lib-$(CONFIG_USLEEP)    += usleep.o
 lib-$(CONFIG_UUDECODE)  += uudecode.o
 lib-$(CONFIG_UUENCODE)  += uuencode.o
 lib-$(CONFIG_WC)        += wc.o
-lib-$(CONFIG_WHO)       += who.o
 lib-$(CONFIG_WHOAMI)    += whoami.o
 lib-$(CONFIG_YES)       += yes.o
diff --git a/coreutils/df.c b/coreutils/df.c
index 846cb38ad..63dbd61bd 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -212,7 +212,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                         {
                                 uni_stat_t uni_stat;
                                 char *uni_dev = unicode_conv_to_printable(&uni_stat, device);
-                                if (uni_stat.unicode_width > 20) {
+                                if (uni_stat.unicode_width > 20 && !(opt & OPT_POSIX)) {
                                         printf("%s\n%20s", uni_dev, "");
                                 } else {
                                         printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, "");
@@ -220,7 +220,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                                 free(uni_dev);
                         }
 #else
-                        if (printf("\n%-20s" + 1, device) > 20)
+                        if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
                                     printf("\n%-20s", "");
 #endif
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4abf84513..9876c2db2 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1120,7 +1120,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
         opt_complementary =
                 /* -e implies -l */
-                "el"
+                IF_FEATURE_LS_TIMESTAMPS("el")
                 /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
                  * in some pairs of opts, only last one takes effect:
                  */
@@ -1130,7 +1130,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                 ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
                 ":C-1:1-C" /* bycols/oneline */
                 ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
-                ":c-u:u-c" /* mtime/atime */
+                IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
                 /* -w NUM: */
                 IF_FEATURE_AUTOWIDTH(":w+");
         opt = getopt32(argv, ls_options
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 53fd4d1a8..2cb6dd43c 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -7,12 +7,11 @@
  */
 
 //usage:#define md5sum_trivial_usage
-//usage:       "[FILE]..."
-//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum -c [-sw] [FILE]")
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
 //usage:#define md5sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\n        -c      Check sums against given list"
+//usage:     "\n        -c      Check sums against list in FILEs"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
 //usage:        )
@@ -28,34 +27,31 @@
 //usage:       "^D\n"
 //usage:
 //usage:#define sha1sum_trivial_usage
-//usage:       "[FILE]..."
-//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum -c [-sw] [FILE]")
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
 //usage:#define sha1sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\n        -c      Check sums against given list"
+//usage:     "\n        -c      Check sums against list in FILEs"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
 //usage:        )
 //usage:
 //usage:#define sha256sum_trivial_usage
-//usage:       "[FILE]..."
-//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum -c [-sw] [FILE]")
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
 //usage:#define sha256sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\n        -c      Check sums against given list"
+//usage:     "\n        -c      Check sums against list in FILEs"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
 //usage:        )
 //usage:
 //usage:#define sha512sum_trivial_usage
-//usage:       "[FILE]..."
-//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum -c [-sw] [FILE]")
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
 //usage:#define sha512sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums"
 //usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\n        -c      Check sums against given list"
+//usage:     "\n        -c      Check sums against list in FILEs"
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
 //usage:        )
@@ -95,7 +91,7 @@ static uint8_t *hash_file(const char *filename)
                 sha1_ctx_t sha1;
                 md5_ctx_t md5;
         } context;
-        uint8_t *hash_value = NULL;
+        uint8_t *hash_value;
         void FAST_FUNC (*update)(void*, const void*, size_t);
         void FAST_FUNC (*final)(void*, void*);
         char hash_algo;
@@ -137,6 +133,7 @@ static uint8_t *hash_file(const char *filename)
                 while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
                         update(&context, in_buf, count);
                 }
+                hash_value = NULL;
                 if (count == 0) {
                         final(&context, in_buf);
                         hash_value = hash_bin_to_hex(in_buf, hash_len);
@@ -178,66 +175,58 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
-                FILE *pre_computed_stream;
-                int count_total = 0;
-                int count_failed = 0;
-                char *line;
+        do {
+                if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
+                        FILE *pre_computed_stream;
+                        char *line;
+                        int count_total = 0;
+                        int count_failed = 0;
 
-                if (argv[1]) {
-                        bb_error_msg_and_die("only one argument may be specified with -c");
-                }
-
-                pre_computed_stream = xfopen_stdin(argv[0]);
+                        pre_computed_stream = xfopen_stdin(*argv);
 
-                while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) {
-                        uint8_t *hash_value;
-                        char *filename_ptr;
+                        while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) {
+                                uint8_t *hash_value;
+                                char *filename_ptr;
 
-                        count_total++;
-                        filename_ptr = strstr(line, "  ");
-                        /* handle format for binary checksums */
-                        if (filename_ptr == NULL) {
-                                filename_ptr = strstr(line, " *");
-                        }
-                        if (filename_ptr == NULL) {
-                                if (flags & FLAG_WARN) {
-                                        bb_error_msg("invalid format");
+                                count_total++;
+                                filename_ptr = strstr(line, "  ");
+                                /* handle format for binary checksums */
+                                if (filename_ptr == NULL) {
+                                        filename_ptr = strstr(line, " *");
                                 }
-                                count_failed++;
-                                return_value = EXIT_FAILURE;
+                                if (filename_ptr == NULL) {
+                                        if (flags & FLAG_WARN) {
+                                                bb_error_msg("invalid format");
+                                        }
+                                        count_failed++;
+                                        return_value = EXIT_FAILURE;
+                                        free(line);
+                                        continue;
+                                }
+                                *filename_ptr = '\0';
+                                filename_ptr += 2;
+
+                                hash_value = hash_file(filename_ptr);
+
+                                if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
+                                        if (!(flags & FLAG_SILENT))
+                                                printf("%s: OK\n", filename_ptr);
+                                } else {
+                                        if (!(flags & FLAG_SILENT))
+                                                printf("%s: FAILED\n", filename_ptr);
+                                        count_failed++;
+                                        return_value = EXIT_FAILURE;
+                                }
+                                /* possible free(NULL) */
+                                free(hash_value);
                                 free(line);
-                                continue;
                         }
-                        *filename_ptr = '\0';
-                        filename_ptr += 2;
-
-                        hash_value = hash_file(filename_ptr);
-
-                        if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
-                                if (!(flags & FLAG_SILENT))
-                                        printf("%s: OK\n", filename_ptr);
-                        } else {
-                                if (!(flags & FLAG_SILENT))
-                                        printf("%s: FAILED\n", filename_ptr);
-                                count_failed++;
-                                return_value = EXIT_FAILURE;
+                        if (count_failed && !(flags & FLAG_SILENT)) {
+                                bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
+                                                         count_failed, count_total);
                         }
-                        /* possible free(NULL) */
-                        free(hash_value);
-                        free(line);
-                }
-                if (count_failed && !(flags & FLAG_SILENT)) {
-                        bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
-                                                 count_failed, count_total);
-                }
-                /*
-                if (fclose_if_not_stdin(pre_computed_stream) == EOF) {
-                        bb_perror_msg_and_die("can't close file %s", file_ptr);
-                }
-                */
-        } else {
-                do {
+                        fclose_if_not_stdin(pre_computed_stream);
+                } else {
                         uint8_t *hash_value = hash_file(*argv);
                         if (hash_value == NULL) {
                                 return_value = EXIT_FAILURE;
@@ -245,7 +234,8 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                                 printf("%s  %s\n", hash_value, *argv);
                                 free(hash_value);
                         }
-                } while (*++argv);
-        }
+                }
+        } while (*++argv);
+
         return return_value;
 }
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 67f94f798..2e4eb5721 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -29,9 +29,7 @@ int usleep_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
         }
 
-        if (usleep(xatou(argv[1]))) {
-                bb_perror_nomsg_and_die();
-        }
+        usleep(xatou(argv[1]));
 
         return EXIT_SUCCESS;
 }
diff --git a/coreutils/who.c b/coreutils/who.c
index 9f37f65fd..c6c925264 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -18,6 +18,31 @@
  */
 /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'.  */
 
+//config:config WHO
+//config:      bool "who"
+//config:      default y
+//config:      depends on FEATURE_UTMP
+//config:      help
+//config:        who is used to show who is logged on.
+
+//config:config USERS
+//config:      bool "users"
+//config:      default y
+//config:      depends on FEATURE_UTMP
+//config:      help
+//config:        Print users currently logged on.
+
+//applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
+//applet:IF_WHO(  APPLET(  who, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_USERS) += who.o
+//kbuild:lib-$(CONFIG_WHO) += who.o
+
+//usage:#define users_trivial_usage
+//usage:       ""
+//usage:#define users_full_usage "\n\n"
+//usage:       "Print the users currently logged on"
+
 //usage:#define who_trivial_usage
 //usage:       "[-a]"
 //usage:#define who_full_usage "\n\n"
@@ -49,9 +74,11 @@ int who_main(int argc UNUSED_PARAM, char **argv)
 {
         struct utmp *ut;
         unsigned opt;
+        int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
+        const char *fmt = "%s";
 
         opt_complementary = "=0";
-        opt = getopt32(argv, "aH");
+        opt = getopt32(argv, do_users ? "" : "aH");
         if (opt & 2) // -H
                 printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n");
 
@@ -60,36 +87,43 @@ int who_main(int argc UNUSED_PARAM, char **argv)
                 if (ut->ut_user[0]
                  && ((opt & 1) || ut->ut_type == USER_PROCESS)
                 ) {
-                        char str6[6];
-                        char name[sizeof("/dev/") + sizeof(ut->ut_line) + 1];
-                        struct stat st;
-                        time_t seconds;
+                        if (!do_users) {
+                                char str6[6];
+                                char name[sizeof("/dev/") + sizeof(ut->ut_line) + 1];
+                                struct stat st;
+                                time_t seconds;
 
-                        str6[0] = '?';
-                        str6[1] = '\0';
-                        strcpy(name, "/dev/");
-                        safe_strncpy(ut->ut_line[0] == '/' ? name : name + sizeof("/dev/")-1,
-                                ut->ut_line,
-                                sizeof(ut->ut_line)+1
-                        );
-                        if (stat(name, &st) == 0)
-                                idle_string(str6, st.st_atime);
-                        /* manpages say ut_tv.tv_sec *is* time_t,
-                         * but some systems have it wrong */
-                        seconds = ut->ut_tv.tv_sec;
-                        /* How wide time field can be?
-                         * "Nov 10 19:33:20": 15 chars
-                         * "2010-11-10 19:33": 16 chars
-                         */
-                        printf("%-15.*s %-15.*s %-7s %-16.16s %.*s\n",
-                                        (int)sizeof(ut->ut_user), ut->ut_user,
-                                        (int)sizeof(ut->ut_line), ut->ut_line,
-                                        str6,
-                                        ctime(&seconds) + 4,
-                                        (int)sizeof(ut->ut_host), ut->ut_host
-                        );
+                                str6[0] = '?';
+                                str6[1] = '\0';
+                                strcpy(name, "/dev/");
+                                safe_strncpy(ut->ut_line[0] == '/' ? name : name + sizeof("/dev/")-1,
+                                        ut->ut_line,
+                                        sizeof(ut->ut_line)+1
+                                );
+                                if (stat(name, &st) == 0)
+                                        idle_string(str6, st.st_atime);
+                                /* manpages say ut_tv.tv_sec *is* time_t,
+                                 * but some systems have it wrong */
+                                seconds = ut->ut_tv.tv_sec;
+                                /* How wide time field can be?
+                                 * "Nov 10 19:33:20": 15 chars
+                                 * "2010-11-10 19:33": 16 chars
+                                 */
+                                printf("%-15.*s %-15.*s %-7s %-16.16s %.*s\n",
+                                                (int)sizeof(ut->ut_user), ut->ut_user,
+                                                (int)sizeof(ut->ut_line), ut->ut_line,
+                                                str6,
+                                                ctime(&seconds) + 4,
+                                                (int)sizeof(ut->ut_host), ut->ut_host
+                                );
+                        } else {
+                                printf(fmt, ut->ut_user);
+                                fmt = " %s";
+                        }
                 }
         }
+        if (do_users)
+                bb_putchar('\n');
         if (ENABLE_FEATURE_CLEAN_UP)
                 endutent();
         return EXIT_SUCCESS;