Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/ls.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/ls.c (modified) (8 diffs)

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

@@ -94 +94 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "unicode.h"
 
@@ -366 +367 @@
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     /* we have to zero it out because of NOEXEC */ \
     memset(&G, 0, sizeof(G)); \
@@ -567 +569 @@
     if (G.all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) {
         char *filetime;
-        time_t ttime = dn->dn_mtime;
+        const time_t *ttime = &dn->dn_mtime;
         if (G.all_fmt & TIME_ACCESS)
-            ttime = dn->dn_atime;
+            ttime = &dn->dn_atime;
         if (G.all_fmt & TIME_CHANGE)
-            ttime = dn->dn_ctime;
-        filetime = ctime(&ttime);
+            ttime = &dn->dn_ctime;
+        filetime = ctime(ttime);
         /* filetime's format: "Wed Jun 30 21:49:08 1993\n" */
         if (G.all_fmt & LIST_FULLTIME) { /* -e */
@@ -581 +583 @@
         } else { /* LIST_DATE_TIME */
             /* G.current_time_t ~== time(NULL) */
-            time_t age = G.current_time_t - ttime;
-            printf("%.6s ", filetime + 4); /* "Jun 30" */
+            time_t age = G.current_time_t - *ttime;
             if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
-                /* hh:mm if less than 6 months old */
-                printf("%.5s ", filetime + 11);
-            } else { /* year. buggy if year > 9999 ;) */
-                printf(" %.4s ", filetime + 20);
+                /* less than 6 months old */
+                /* "mmm dd hh:mm " */
+                printf("%.12s ", filetime + 4);
+            } else {
+                /* "mmm dd  yyyy " */
+                /* "mmm dd yyyyy " after year 9999 :) */
+                strchr(filetime + 20, '\n')[0] = ' ';
+                printf("%.7s%6s", filetime + 4, filetime + 20);
             }
             column += 13;
@@ -666 +671 @@
                 column_width = len;
         }
-        column_width += 1 +
+        column_width += 2 +
             IF_SELINUX( ((G.all_fmt & LIST_CONTEXT) ? 33 : 0) + )
                 ((G.all_fmt & LIST_INO) ? 8 : 0) +
@@ -694 +699 @@
                 if (column > 0) {
                     nexttab -= column;
-                    printf("%*s ", nexttab, "");
-                    column += nexttab + 1;
+                    printf("%*s", nexttab, "");
+                    column += nexttab;
                 }
                 nexttab = column + column_width;
@@ -1033 +1038 @@
         subdnp = scan_one_dir((*dn)->fullname, &nfiles);
 #if ENABLE_DESKTOP
-        if ((G.all_fmt & STYLE_MASK) == STYLE_LONG)
+        if ((G.all_fmt & STYLE_MASK) == STYLE_LONG || (G.all_fmt & LIST_BLOCKS))
             printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
 #endif
@@ -1103 +1108 @@
 #if ENABLE_FEATURE_AUTOWIDTH
     /* obtain the terminal width */
-    get_terminal_width_height(STDIN_FILENO, &G_terminal_width, NULL);
+    G_terminal_width = get_terminal_width(STDIN_FILENO);
     /* go one less... */
     G_terminal_width--;