Fix a stupid bug revealed by multibuild.pl

[oweals/busybox.git] / touch.c

diff --git a/touch.c b/touch.c
index ca4b981081143b8bda4e2d98e07874dadafb19f7..1718da71e28fb2d649d83f65d417b90f2633e8a9 100644 (file)
--- a/touch.c
+++ b/touch.c
@@ -1,20 +1,75 @@
-#include "internal.h"
-#include <sys/types.h>
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini touch implementation for busybox
+ *
+ *
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #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"
 
-const char     touch_usage[] = "touch [-c] file [file ...]\n"
-"\n"
-"\tUpdate the last-modified date on the given file[s].\n";
-
-extern int
-touch_fn(const struct FileInfo * i)
+extern int touch_main(int argc, char **argv)
 {
-       if ( (utime(i->source, 0) != 0) && (i->create != 1) ) {
-               if ( fopen(i->source, "w") == NULL ) {
-                       name_and_error(i->source);
-                       return 1;
+       int fd;
+       int create = TRUE;
+
+       /* Parse options */
+       while (--argc > 0 && **(++argv) == '-') {
+               while (*(++(*argv))) {
+                       switch (**argv) {
+                       case 'c':
+                               create = FALSE;
+                               break;
+                       default:
+                               show_usage();
+                       }
+               }
+       }
+
+       if (argc < 1) {
+               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 {
+                               perror_msg_and_die("%s", *argv);
+                       }
+               }
+               close(fd);
+               if (utime(*argv, NULL)) {
+                       perror_msg_and_die("%s", *argv);
                }
+               argc--;
+               argv++;
        }
-       return 0;
+
+       return EXIT_SUCCESS;
 }