emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

touch: needs another fix after last utimes() fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-11-30 11:36:14 +01:00
parent 1284774d60
commit d0f9d0ed58
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
coreutils/touch.c
View File

@ -59,7 +59,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
#else #else
# define reference_file NULL # define reference_file NULL
# define date_str NULL # define date_str NULL
# define timebuf (*(struct timeval*)NULL) # define timebuf ((struct timeval*)NULL)
#endif #endif
#if ENABLE_DESKTOP && ENABLE_LONG_OPTS #if ENABLE_DESKTOP && ENABLE_LONG_OPTS
@ -104,16 +104,15 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
} }
do { do {
if (utimes(*argv, reference_file ? timebuf : NULL)) { if (utimes(*argv, reference_file ? timebuf : NULL) != 0) {
if (errno == ENOENT) { /* no such file */ if (errno == ENOENT) { /* no such file */
if (opts) { /* creation is disabled, so ignore */ if (opts) { /* creation is disabled, so ignore */
continue; continue;
} }
/* Try to create the file. */ /* Try to create the file */
fd = open(*argv, O_RDWR | O_CREAT, fd = open(*argv, O_RDWR | O_CREAT, 0666);
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH if (fd >= 0) {
); xclose(fd);
if ((fd >= 0) && !close(fd)) {
if (reference_file) if (reference_file)
utimes(*argv, timebuf); utimes(*argv, timebuf);
continue; continue;