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 be2d2f92584060030bfd4a870e5483e14f7fd5ec..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. */
@@ -59,7 +59,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
 #else
 # define reference_file NULL
 # define date_str       NULL
-# define timebuf        (*(struct timeval*)NULL)
+# define timebuf        ((struct timeval*)NULL)
 #endif
 
 #if ENABLE_DESKTOP && ENABLE_LONG_OPTS
@@ -104,17 +104,16 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
        }
 
        do {
-               if (utimes(*argv, reference_file ? timebuf : NULL)) {
+               if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) {
                        if (errno == ENOENT) { /* no such file */
                                if (opts) { /* 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)) {
-                                       if (reference_file)
+                               /* Try to create the file */
+                               fd = open(*argv, O_RDWR | O_CREAT, 0666);
+                               if (fd >= 0) {
+                                       xclose(fd);
+                                       if (reference_file || date_str)
                                                utimes(*argv, timebuf);
                                        continue;
                                }