X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftouch.c;h=645fb21743282e4d945503d7aaf409c5764b7483;hb=843c5ef0f95e0a6f61f4e27d0355aca5e09ee6b1;hp=b98a2e4c84edbe90b08ff35bdfde163d5c7c1fc5;hpb=c49960189a04b73e033016bd0f43fbb950f800e1;p=oweals%2Fbusybox.git

diff --git a/coreutils/touch.c b/coreutils/touch.c
index b98a2e4c8..645fb2174 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -1,9 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini touch implementation for busybox
  *
- *
- * Copyright (C) 1999 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
@@ -21,66 +20,57 @@
  *
  */
 
-#include "internal.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 <sys/stat.h>
 #include <fcntl.h>
 #include <utime.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-
-static const char touch_usage[] = "touch [-c] file [file ...]\n\n"
-"\tUpdate the last-modified date on the given file[s].\n";
-
-
-
-extern int 
-touch_main(int argc, char **argv)
+extern int touch_main(int argc, char **argv)
 {
-    int fd;
-    int create=TRUE;
+	int fd;
+	int flags;
+	int status = EXIT_SUCCESS;
 
-    if (argc < 2) {
-	usage( touch_usage);
-    }
-    argc--;
-    argv++;
+	flags = bb_getopt_ulflags(argc, argv, "c");
 
-    /* Parse options */
-    while (**argv == '-') {
-	while (*++(*argv)) switch (**argv) {
-	    case 'c':
-		create = FALSE;
-		break;
-	    default:
-		fprintf(stderr, "Unknown option: %c\n", **argv);
-		exit( FALSE);
-	}
-	argc--;
-	argv++;
-    }
+	argv += optind;
 
-    fd = open (*argv, (create==FALSE)? O_RDWR : O_RDWR | O_CREAT, 0644);
-    if (fd < 0 ) {
-	if (create==FALSE && errno == ENOENT)
-	    exit( TRUE);
-	else {
-	    perror("touch");
-	    exit( FALSE);
+	if (!*argv) {
+		bb_show_usage();
 	}
-    }
-    close( fd);
-    if (utime (*argv, NULL)) {
-	perror("touch");
-	exit( FALSE);
-    }
-    else
-	exit( TRUE);
-}
-
-
-
-
 
+	do {
+		if (utime(*argv, NULL)) {
+			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);
+		}
+	} while (*++argv);
 
+	return status;
+}