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

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

@@ -27 +27 @@
 //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)"
@@ -43 +51 @@
 //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"
@@ -66 +77 @@
  * -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
@@ -80 +92 @@
     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
@@ -87 +106 @@
         "reference\0"         Required_argument "r"
         "date\0"              Required_argument "d"
+        IF_FEATURE_TOUCH_NODEREF("no-dereference\0" No_argument "h")
     ;
 # endif
@@ -106 +126 @@
      * 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)
@@ -112 +133 @@
     );
 
-    opts &= 1; /* only -c bit is left */
     argv += optind;
     if (!*argv) {
@@ -122 +142 @@
         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.
+         */
     }
 
@@ -142 +166 @@
 
     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;
                 }