lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/touch.c b/coreutils/touch.c
index 1d55417106df8ec37256e798bd40438390a1680f..03aac3aa2f8f9a01cc8ceadb29138cf3d46c889f 100644 (file)
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */
@@ -40,32 +40,40 @@
 int touch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int touch_main(int argc UNUSED_PARAM, char **argv)
 {
+       int fd;
+       int status = EXIT_SUCCESS;
+       int opts;
 #if ENABLE_DESKTOP
-#if ENABLE_GETOPT_LONG
-       static const char longopts[] ALIGN1 =
+# 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;
+# endif
        char *reference_file = NULL;
+       char *date_str = NULL;
+       struct timeval timebuf[2];
+       timebuf[1].tv_usec = timebuf[0].tv_usec = 0;
 #else
-#define reference_file NULL
-#define timebuf        (*(struct utimbuf*)NULL)
+# define reference_file NULL
+# define date_str       NULL
+# define timebuf        ((struct timeval*)NULL)
 #endif
-       int fd;
-       int status = EXIT_SUCCESS;
-       int opts;
 
-#if ENABLE_DESKTOP
-#if ENABLE_GETOPT_LONG
-       applet_long_options = longopts;
-#endif
+#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
+       applet_long_options = touch_longopts;
 #endif
-       opts = getopt32(argv, "c" IF_DESKTOP("r:")
+       /* -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(, &reference_file)
+                               IF_DESKTOP(, &date_str)
+                               IF_DESKTOP(, &date_str)
+       );
 
        opts &= 1; /* only -c bit is left */
        argv += optind;
@@ -76,23 +84,37 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
        if (reference_file) {
                struct stat stbuf;
                xstat(reference_file, &stbuf);
-               timebuf.actime = stbuf.st_atime;
-               timebuf.modtime = stbuf.st_mtime;
+               timebuf[1].tv_sec = timebuf[0].tv_sec = 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[1].tv_sec = timebuf[0].tv_sec = t;
        }
 
        do {
-               if (utime(*argv, reference_file ? &timebuf : NULL)) {
+               if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) {
                        if (errno == ENOENT) { /* no such file */
                                if (opts) { /* creation is disabled, so ignore */
                                        continue;
                                }
-                               /* Try to create the file. */
-                               fd = open(*argv, O_RDWR | O_CREAT,
-                                                 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
-                                                 );
-                               if ((fd >= 0) && !close(fd)) {
-                                       if (reference_file)
-                                               utime(*argv, &timebuf);
+                               /* Try to create the file */
+                               fd = open(*argv, O_RDWR | O_CREAT, 0666);
+                               if (fd >= 0) {
+                                       xclose(fd);
+                                       if (reference_file || date_str)
+                                               utimes(*argv, timebuf);
                                        continue;
                                }
                        }