Merge branch 'busybox' into merge

Conflicts:
	archival/Config.src
	shell/ash.c

5 files changed, 45 insertions, 18 deletions

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 0d388aa1c..12c46b14f 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -165,7 +165,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 char lineout[30];
 
                 day_array(month, year, dp);
-                len = sprintf(lineout, "%s %d", month_names[month - 1], year);
+                len = sprintf(lineout, "%s %u", month_names[month - 1], year);
                 printf("%*s%s\n%s\n",
                                 ((7*julian + WEEK_LEN) - len) / 2, "",
                                 lineout, day_headings);
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 25bbffc66..8d376ff4e 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -78,11 +78,7 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt)
                                 unsigned len;
                                 *ptr = '\0';
 # if ENABLE_UNICODE_SUPPORT
-                                {
-                                        uni_stat_t uni_stat;
-                                        printable_string(&uni_stat, ptr_strbeg);
-                                        len = uni_stat.unicode_width;
-                                }
+                                len = unicode_strwidth(ptr_strbeg);
 # else
                                 len = ptr - ptr_strbeg;
 # endif
@@ -138,12 +134,9 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
                         printf("%*s%.*s", len, "", n, ptr);
 # if ENABLE_UNICODE_SUPPORT
                         {
-                                char c;
-                                uni_stat_t uni_stat;
-                                c = ptr[n];
+                                char c = ptr[n];
                                 ptr[n] = '\0';
-                                printable_string(&uni_stat, ptr);
-                                len = uni_stat.unicode_width;
+                                len = unicode_strwidth(ptr);
                                 ptr[n] = c;
                         }
 # else
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 75f6ef60a..deb068e10 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -70,9 +70,9 @@ static unsigned sum_file(const char *file, unsigned type)
         if (type >= SUM_SYSV) {
                 r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
                 s = (r & 0xffff) + (r >> 16);
-                printf("%d %llu %s\n", s, (total_bytes + 511) / 512, file);
+                printf("%u %llu %s\n", s, (total_bytes + 511) / 512, file);
         } else
-                printf("%05d %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
+                printf("%05u %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
         return 1;
 #undef buf
 }
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 07c71ca4b..eab502beb 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -105,6 +105,7 @@ int tail_main(int argc, char **argv)
 
         int *fds;
         const char *fmt;
+        int prev_fd;
 
         INIT_G();
 
@@ -309,6 +310,7 @@ int tail_main(int argc, char **argv)
                         xwrite(STDOUT_FILENO, tailbuf, taillen);
                 }
         } while (++i < nfiles);
+        prev_fd = fds[i-1];
 
         tailbuf = xrealloc(tailbuf, BUFSIZ);
 
@@ -365,9 +367,10 @@ int tail_main(int argc, char **argv)
                                 nread = tail_read(fd, tailbuf, BUFSIZ);
                                 if (nread <= 0)
                                         break;
-                                if (fmt) {
+                                if (fmt && (fd != prev_fd)) {
                                         tail_xprint_header(fmt, filename);
                                         fmt = NULL;
+                                        prev_fd = fd;
                                 }
                                 xwrite(STDOUT_FILENO, tailbuf, nread);
                         }
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 1216ca202..293a96890 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -26,6 +26,14 @@
 //config:         touch is used to create or change the access and/or
 //config:         modification timestamp of specified files.
 //config:
+//config:config FEATURE_TOUCH_NODEREF
+//config:       bool "Add support for -h"
+//config:       default y
+//config:       depends on TOUCH
+//config:       help
+//config:         Enable touch to have the -h option.
+//config:         This requires libc support for lutimes() function.
+//config:
 //config:config FEATURE_TOUCH_SUSV3
 //config:       bool "Add support for SUSV3 features (-d -t -r)"
 //config:       default y
@@ -42,6 +50,9 @@
 //usage:#define touch_full_usage "\n\n"
 //usage:       "Update the last-modified date on the given FILE[s]\n"
 //usage:     "\n        -c      Don't create files"
+//usage:        IF_FEATURE_TOUCH_NODEREF(
+//usage:     "\n        -h      Don't follow links"
+//usage:        )
 //usage:        IF_FEATURE_TOUCH_SUSV3(
 //usage:     "\n        -d DT   Date/time to use"
 //usage:     "\n        -t DT   Date/time to use"
@@ -65,6 +76,7 @@
  *      parse STRING and use it instead of current time
  * -f   (ignored, BSD compat)
  * -m   change only the modification time
+ * -h, --no-dereference
  * -r, --reference=FILE
  *      use this file's times instead of current time
  * -t STAMP
@@ -79,6 +91,13 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
         int fd;
         int status = EXIT_SUCCESS;
         int opts;
+        enum {
+                OPT_c = (1 << 0),
+                OPT_r = (1 << 1) * ENABLE_FEATURE_TOUCH_SUSV3,
+                OPT_d = (1 << 2) * ENABLE_FEATURE_TOUCH_SUSV3,
+                OPT_t = (1 << 3) * ENABLE_FEATURE_TOUCH_SUSV3,
+                OPT_h = (1 << 4) * ENABLE_FEATURE_TOUCH_NODEREF,
+        };
 #if ENABLE_FEATURE_TOUCH_SUSV3
 # if ENABLE_LONG_OPTS
         static const char touch_longopts[] ALIGN1 =
@@ -86,6 +105,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                 "no-create\0"         No_argument       "c"
                 "reference\0"         Required_argument "r"
                 "date\0"              Required_argument "d"
+                IF_FEATURE_TOUCH_NODEREF("no-dereference\0" No_argument "h")
         ;
 # endif
         char *reference_file = NULL;
@@ -105,13 +125,13 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
          * accepted data format differs a bit between -d and -t.
          * We accept the same formats for both */
         opts = getopt32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
+                                IF_FEATURE_TOUCH_NODEREF("h")
                                 /*ignored:*/ "fma"
                                 IF_FEATURE_TOUCH_SUSV3(, &reference_file)
                                 IF_FEATURE_TOUCH_SUSV3(, &date_str)
                                 IF_FEATURE_TOUCH_SUSV3(, &date_str)
         );
 
-        opts &= 1; /* only -c bit is left */
         argv += optind;
         if (!*argv) {
                 bb_show_usage();
@@ -121,6 +141,10 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                 struct stat stbuf;
                 xstat(reference_file, &stbuf);
                 timebuf[1].tv_sec = timebuf[0].tv_sec = stbuf.st_mtime;
+                /* Can use .st_mtim.tv_nsec
+                 * (or is it .st_mtimensec?? see date.c)
+                 * to set microseconds too.
+                 */
         }
 
         if (date_str) {
@@ -141,9 +165,16 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
         }
 
         do {
-                if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) {
-                        if (errno == ENOENT) { /* no such file */
-                                if (opts) { /* creation is disabled, so ignore */
+                int result;
+                result = (
+#if ENABLE_FEATURE_TOUCH_NODEREF
+                        (opts & OPT_h) ? lutimes :
+#endif
+                        utimes)(*argv, (reference_file || date_str) ? timebuf : NULL);
+                if (result != 0) {
+                        if (errno == ENOENT) { /* no such file? */
+                                if (opts & OPT_c) {
+                                        /* Creation is disabled, so ignore */
                                         continue;
                                 }
                                 /* Try to create the file */