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 3f7b265bde1768a5c2ff809bca9dd472f02a4bb0..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. */
@@ -104,7 +104,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
        }
 
        do {
-               if (utimes(*argv, reference_file ? timebuf : NULL) != 0) {
+               if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) {
                        if (errno == ENOENT) { /* no such file */
                                if (opts) { /* creation is disabled, so ignore */
                                        continue;
@@ -113,7 +113,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                                fd = open(*argv, O_RDWR | O_CREAT, 0666);
                                if (fd >= 0) {
                                        xclose(fd);
-                                       if (reference_file)
+                                       if (reference_file || date_str)
                                                utimes(*argv, timebuf);
                                        continue;
                                }