Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/touch.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/touch.c (modified) (6 diffs)

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

@@ -8 +8 @@
  */
 
-/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */
+/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m not supported. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/touch.html */
 
@@ -19 +19 @@
 
 #include "libbb.h"
+
+//config:config TOUCH
+//config:   bool "touch"
+//config:   default y
+//config:   help
+//config:     touch is used to create or change the access and/or
+//config:     modification timestamp of specified files.
+//config:
+//config:config FEATURE_TOUCH_SUSV3
+//config:   bool "Add support for SUSV3 features (-d -t -r)"
+//config:   default y
+//config:   depends on TOUCH
+//config:   help
+//config:     Enable touch to use a reference file or a given date/time argument.
+
+//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch))
+
+//kbuild:lib-$(CONFIG_TOUCH) += touch.o
+
+//usage:#define touch_trivial_usage
+//usage:       "[-c]" IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") " FILE..."
+//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_SUSV3(
+//usage:     "\n    -d DT   Date/time to use"
+//usage:     "\n    -t DT   Date/time to use"
+//usage:     "\n    -r FILE Use FILE's date/time"
+//usage:    )
+//usage:
+//usage:#define touch_example_usage
+//usage:       "$ ls -l /tmp/foo\n"
+//usage:       "/bin/ls: /tmp/foo: No such file or directory\n"
+//usage:       "$ touch /tmp/foo\n"
+//usage:       "$ ls -l /tmp/foo\n"
+//usage:       "-rw-rw-r--    1 andersen andersen        0 Apr 15 01:11 /tmp/foo\n"
 
 /* This is a NOFORK applet. Be very careful! */
@@ -44 +80 @@
     int status = EXIT_SUCCESS;
     int opts;
-#if ENABLE_DESKTOP
+#if ENABLE_FEATURE_TOUCH_SUSV3
 # if ENABLE_LONG_OPTS
     static const char touch_longopts[] ALIGN1 =
@@ -63 +99 @@
 #endif
 
-#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
+#if ENABLE_FEATURE_TOUCH_SUSV3 && ENABLE_LONG_OPTS
     applet_long_options = touch_longopts;
 #endif
@@ -69 +105 @@
      * accepted data format differs a bit between -d and -t.
      * We accept the same formats for both */
-    opts = getopt32(argv, "c" IF_DESKTOP("r:d:t:")
+    opts = getopt32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
                 /*ignored:*/ "fma"
-                IF_DESKTOP(, &reference_file)
-                IF_DESKTOP(, &date_str)
-                IF_DESKTOP(, &date_str)
+                IF_FEATURE_TOUCH_SUSV3(, &reference_file)
+                IF_FEATURE_TOUCH_SUSV3(, &date_str)
+                IF_FEATURE_TOUCH_SUSV3(, &date_str)
     );
 
@@ -92 +128 @@
         time_t t;
 
-        //time(&t);
-        //localtime_r(&t, &tm_time);
-        memset(&tm_time, 0, sizeof(tm_time));
+        //memset(&tm_time, 0, sizeof(tm_time));
+        /* Better than memset: makes "HH:MM" dates meaningful */
+        time(&t);
+        localtime_r(&t, &tm_time);
         parse_datestr(date_str, &tm_time);