- backout using features which are not available with the previous stable

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

diff --git a/coreutils/touch.c b/coreutils/touch.c
index 5537fb63bfec60f2107d13498ea4e771358cf552..f78fe5114c1b7a1c5472855c61a2cd978662e1b6 100644 (file)
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -2,9 +2,7 @@
 /*
  * Mini touch implementation for busybox
  *
- *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,52 +20,57 @@
  *
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/touch.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Previous version called open() and then utime().  While this will be
+ * be necessary to implement -r and -t, it currently only makes things bigger.
+ * Also, exiting on a failure was a bug.  All args should be processed.
+ */
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <utime.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-extern int touch_main(int argc, char **argv)
+int touch_main(int argc, char **argv)
 {
        int fd;
-       int create = TRUE;
+       int flags;
+       int status = EXIT_SUCCESS;
 
-       /* Parse options */
-       while (--argc > 0 && **(++argv) == '-') {
-               while (*(++(*argv))) {
-                       switch (**argv) {
-                       case 'c':
-                               create = FALSE;
-                               break;
-                       default:
-                               usage(touch_usage);
-                       }
-               }
-       }
+       flags = bb_getopt_ulflags(argc, argv, "c");
 
-       if (argc < 1) {
-               usage(touch_usage);
+       argv += optind;
+
+       if (!*argv) {
+               bb_show_usage();
        }
 
-       while (argc > 0) {
-               fd = open(*argv, (create == FALSE) ? O_RDWR : O_RDWR | O_CREAT,
-                               S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-               if (fd < 0) {
-                       if (create == FALSE && errno == ENOENT)
-                               return EXIT_SUCCESS;
-                       else {
-                               fatalError("%s", strerror(errno));
-                       }
-               }
-               close(fd);
+       do {
                if (utime(*argv, NULL)) {
-                       fatalError("%s", strerror(errno));
+                       if (errno == ENOENT) {  /* no such file*/
+                               if (flags & 1) {        /* 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)) {
+                                       continue;
+                               }
+                       }
+                       status = EXIT_FAILURE;
+                       bb_perror_msg("%s", *argv);
                }
-               argc--;
-               argv++;
-       }
+       } while (*++argv);
 
-       return EXIT_SUCCESS;
+       return status;
 }