X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftouch.c;h=3fe8b64ad1d1446787023f868d07fcd4118194fa;hb=d7e2e127a93afe2a88922ef94fa00fe8db39d834;hp=1364bb7d57c1f5655a89ca1664faddcac9a89ce0;hpb=5a0a2aa00be4a19dd52b65b70c7cc6d944a5aef6;p=oweals%2Fbusybox.git

diff --git a/coreutils/touch.c b/coreutils/touch.c
index 1364bb7d5..3fe8b64ad 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -2,84 +2,57 @@
 /*
  * Mini touch implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Copyright (C) 1999,2000 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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <errno.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.
+ */
 
-static const char touch_usage[] = "touch [-c] file [file ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUpdate the last-modified date on the given file[s].\n\n"
-	"Options:\n"
-	"\t-c\tDo not create any files\n"
-#endif
-	;
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
 
-extern int touch_main(int argc, char **argv)
+int touch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int touch_main(int argc, char **argv)
 {
 	int fd;
-	int create = TRUE;
+	int status = EXIT_SUCCESS;
+	int flags = getopt32(argv, "cf");
 
-	/* Parse options */
-	while (--argc > 0 && **(++argv) == '-') {
-		while (*(++(*argv))) {
-			switch (**argv) {
-			case 'c':
-				create = FALSE;
-				break;
-			default:
-				usage(touch_usage);
-				exit(FALSE);
-			}
-		}
-	}
+	flags &= 1; /* ignoring -f (BSD compat thingy) */
+	argv += optind;
 
-	if (argc < 1) {
-		usage(touch_usage);
+	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)
-				exit(TRUE);
-			else {
-				fatalError("touch: %s", strerror(errno));
-			}
-		}
-		close(fd);
+	do {
 		if (utime(*argv, NULL)) {
-			fatalError("touch: %s", strerror(errno));
+			if (errno == ENOENT) {	/* no such file */
+				if (flags) {	/* 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_simple_perror_msg(*argv);
 		}
-		argc--;
-		argv++;
-	}
+	} while (*++argv);
 
-	exit(TRUE);
+	return status;
 }