svn commit: r198175 - head/usr.bin/touch
Jaakko Heinonen
jh at FreeBSD.org
Fri Oct 16 20:52:45 UTC 2009
Author: jh
Date: Fri Oct 16 20:52:45 2009
New Revision: 198175
URL: http://svn.freebsd.org/changeset/base/198175
Log:
- If lstat()/stat() fails with an error other than ENOENT, don't ignore
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)
Modified:
head/usr.bin/touch/touch.c
Modified: head/usr.bin/touch/touch.c
==============================================================================
--- head/usr.bin/touch/touch.c Fri Oct 16 19:30:48 2009 (r198174)
+++ head/usr.bin/touch/touch.c Fri Oct 16 20:52:45 2009 (r198175)
@@ -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);
}
More information about the svn-src-head
mailing list