d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- If lstat()/stat() fails with an error other than ENOENT, don't ignore

Browse Source 
the error and assume that the file doesn't exist. Touch could return
  success with -c option even if the file existed and time was not set.
- If the first utimes_f() call fails with -A option, give up and don't
  continue trying to set times to current time. [1]
- Set exit status to 1 when setting of timestamps fails for a directory
  or symbolic link even though lstat()/stat() would succeed.
- Don't print bogus error message when rw() succeeds.

PR:		bin/112213
Submitted by:	jilles [1]
Reviewed by:	jilles
Approved by:	trasz (mentor)
This commit is contained in:
Jaakko Heinonen 2009-10-16 20:52:45 +00:00
parent 12ac99dc46
commit c64b097bfc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/touch/touch.c
View File

@ -164,6 +164,11 @@ main(int argc, char *argv[])
for (rval = 0; *argv; ++argv) {
/* See if the file exists. */
if (stat_f(*argv, &sb) != 0) {
if (errno != ENOENT) {
rval = 1;
warn("%s", *argv);
continue;
}
if (!cflag) {
/* Create the file. */
fd = open(*argv,
@ -206,7 +211,7 @@ main(int argc, char *argv[])
continue;
/* If the user specified a time, nothing else we can do. */
if (timeset) {
if (timeset || Aflag) {
rval = 1;
warn("%s", *argv);
continue;
@ -222,11 +227,13 @@ main(int argc, char *argv[])
continue;
/* Try reading/writing. */
if (!S_ISLNK(sb.st_mode) && !S_ISDIR(sb.st_mode) &&
rw(*argv, &sb, fflag))
if (!S_ISLNK(sb.st_mode) && !S_ISDIR(sb.st_mode)) {
if (rw(*argv, &sb, fflag))
rval = 1;
} else {
rval = 1;
else
warn("%s", *argv);
}
}
exit(rval);
}