Apply post-1.11.0 patches. Bump version to 1.11.1.

2 files changed, 24 insertions, 23 deletions

diff --git a/coreutils/uname.c b/coreutils/uname.c
index 2eecb5d6d..76fd3ca8d 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -17,7 +17,7 @@
    -m, --machine        sun
    -a, --all            SunOS rocky8 4.0  sun
 
-   The default behavior is equivalent to `-s'.
+   The default behavior is equivalent to '-s'.
 
    David MacKenzie <djm@gnu.ai.mit.edu> */
 
@@ -39,47 +39,43 @@ typedef struct {
 } 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 unsigned short utsname_offset[] = {
+        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)
 };
 
 int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int uname_main(int argc, char **argv)
+int uname_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
         uname_info_t uname_info;
 #if defined(__sparc__) && defined(__linux__)
         char *fake_sparc = getenv("FAKE_SPARC");
 #endif
-        const unsigned short int *delta;
+        const unsigned short *delta;
         char toprint;
 
         toprint = getopt32(argv, options);
 
-        if (argc != optind) {
+        if (argv[optind]) { /* coreutils-6.9 compat */
                 bb_show_usage();
         }
 
-        if (toprint & (1 << 6)) {
+        if (toprint & (1 << 6)) { /* -a => all opts on */
                 toprint = 0x3f;
         }
 
-        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
@@ -89,7 +85,8 @@ int uname_main(int argc, char **argv)
         delta = utsname_offset;
         do {
                 if (toprint & 1) {
-                        printf(((char *)(&uname_info)) + *delta);
+                        /* printf would not be safe here */
+                        fputs((char *)(&uname_info) + *delta, stdout);
                         if (toprint > 1) {
                                 bb_putchar(' ');
                         }
@@ -98,5 +95,5 @@ int uname_main(int argc, char **argv)
         } while (toprint >>= 1);
         bb_putchar('\n');
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
 }
diff --git a/coreutils/who.c b/coreutils/who.c
index a206ec54b..72fc40453 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -56,16 +56,20 @@ int who_main(int argc ATTRIBUTE_UNUSED, char **argv)
         printf("USER       TTY      IDLE      TIME            HOST\n");
         while ((ut = getutent()) != NULL) {
                 if (ut->ut_user[0] && (opt || ut->ut_type == USER_PROCESS)) {
+                        time_t tmp;
                         /* ut->ut_line is device name of tty - "/dev/" */
                         name = concat_path_file("/dev", ut->ut_line);
                         str6[0] = '?';
                         str6[1] = '\0';
                         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 */
+                        tmp = ut->ut_tv.tv_sec;
                         /* 15 chars for time:   Nov 10 19:33:20 */
                         printf("%-10s %-8s %-9s %-15.15s %s\n",
                                         ut->ut_user, ut->ut_line, str6,
-                                        ctime(&(ut->ut_tv.tv_sec)) + 4, ut->ut_host);
+                                        ctime(&tmp) + 4, ut->ut_host);
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 free(name);
                 }