svn commit: r205790 - stable/8/usr.bin/touch

[Jaakko Heinonen]

Author: jh
Date: Sun Mar 28 11:22:38 2010
New Revision: 205790
URL: http://svn.freebsd.org/changeset/base/205790

Log:
  MFC r198175:
  
  - 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

Modified:
  stable/8/usr.bin/touch/touch.c
Directory Properties:
  stable/8/usr.bin/touch/   (props changed)

Modified: stable/8/usr.bin/touch/touch.c
==============================================================================
--- stable/8/usr.bin/touch/touch.c	Sun Mar 28 06:51:50 2010	(r205789)
+++ stable/8/usr.bin/touch/touch.c	Sun Mar 28 11:22:38 2010	(r205790)
@@ -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);
 }