rpm2cpio: handle bz2 too; code shrink

[oweals/busybox.git] / coreutils / touch.c

diff --git a/coreutils/touch.c b/coreutils/touch.c
index 3fe8b64ad1d1446787023f868d07fcd4118194fa..e79092fc1cf9bf2c35dbec55b72f14b7ed0ebb1d 100644 (file)
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -21,24 +21,93 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
+/* coreutils implements:
+ * -a   change only the access time
+ * -c, --no-create
+ *      do not create any files
+ * -d, --date=STRING
+ *      parse STRING and use it instead of current time
+ * -f   (ignored, BSD compat)
+ * -m   change only the modification time
+ * -r, --reference=FILE
+ *      use this file's times instead of current time
+ * -t STAMP
+ *      use [[CC]YY]MMDDhhmm[.ss] instead of current time
+ * --time=WORD
+ *      change the specified time: WORD is access, atime, or use
+ */
+
 int touch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int touch_main(int argc, char **argv)
+int touch_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_DESKTOP
+# if ENABLE_LONG_OPTS
+       static const char touch_longopts[] ALIGN1 =
+               /* name, has_arg, val */
+               "no-create\0"         No_argument       "c"
+               "reference\0"         Required_argument "r"
+               "date\0"              Required_argument "d"
+       ;
+# endif
+       struct utimbuf timebuf;
+       char *reference_file = NULL;
+       char *date_str = NULL;
+#else
+# define reference_file NULL
+# define date_str       NULL
+# define timebuf        (*(struct utimbuf*)NULL)
+#endif
        int fd;
        int status = EXIT_SUCCESS;
-       int flags = getopt32(argv, "cf");
+       int opts;
 
-       flags &= 1; /* ignoring -f (BSD compat thingy) */
-       argv += optind;
+#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
+       applet_long_options = touch_longopts;
+#endif
+       /* -d and -t both set time. In coreutils,
+        * 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:")
+                               /*ignored:*/ "fma"
+                               IF_DESKTOP(, &reference_file)
+                               IF_DESKTOP(, &date_str)
+                               IF_DESKTOP(, &date_str)
+       );
 
+       opts &= 1; /* only -c bit is left */
+       argv += optind;
        if (!*argv) {
                bb_show_usage();
        }
 
+       if (reference_file) {
+               struct stat stbuf;
+               xstat(reference_file, &stbuf);
+               timebuf.actime = stbuf.st_atime;
+               timebuf.modtime = stbuf.st_mtime;
+       }
+
+       if (date_str) {
+               struct tm tm_time;
+               time_t t;
+
+               //time(&t);
+               //localtime_r(&t, &tm_time);
+               memset(&tm_time, 0, sizeof(tm_time));
+               parse_datestr(date_str, &tm_time);
+
+               /* Correct any day of week and day of year etc. fields */
+               tm_time.tm_isdst = -1;  /* Be sure to recheck dst */
+               t = validate_tm_time(date_str, &tm_time);
+
+               timebuf.actime = t;
+               timebuf.modtime = t;
+       }
+
        do {
-               if (utime(*argv, NULL)) {
-                       if (errno == ENOENT) {  /* no such file */
-                               if (flags) {    /* Creation is disabled, so ignore. */
+               if (utime(*argv, reference_file ? &timebuf : NULL)) {
+                       if (errno == ENOENT) { /* no such file */
+                               if (opts) { /* creation is disabled, so ignore */
                                        continue;
                                }
                                /* Try to create the file. */
@@ -46,6 +115,8 @@ int touch_main(int argc, char **argv)
                                                  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
                                                  );
                                if ((fd >= 0) && !close(fd)) {
+                                       if (reference_file)
+                                               utime(*argv, &timebuf);
                                        continue;
                                }
                        }