diff options
| author | Denys Vlasenko | 2009-11-30 11:36:14 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2009-11-30 11:36:14 +0100 |
| commit | d0f9d0ed5867d1ca0fbe96d37f68cfab443e949a (patch) | |
| tree | 562627c8466015845f7f41fd72ab3091802559cf | |
| parent | 1284774d60ebce68dec6fcaf44a33e928c4c1f82 (diff) | |
| download | busybox-d0f9d0ed5867d1ca0fbe96d37f68cfab443e949a.zip busybox-d0f9d0ed5867d1ca0fbe96d37f68cfab443e949a.tar.gz | |
touch: needs another fix after last utimes() fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/touch.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/coreutils/touch.c b/coreutils/touch.c index be2d2f9..3f7b265 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -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,16 +104,15 @@ int touch_main(int argc UNUSED_PARAM, char **argv) } do { - if (utimes(*argv, reference_file ? timebuf : NULL)) { + if (utimes(*argv, reference_file ? 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)) { + /* Try to create the file */ + fd = open(*argv, O_RDWR | O_CREAT, 0666); + if (fd >= 0) { + xclose(fd); if (reference_file) utimes(*argv, timebuf); continue; |