From owner-svn-src-all@FreeBSD.ORG  Fri Oct 16 20:52:45 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A35D21065676;
	Fri, 16 Oct 2009 20:52:45 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9203D8FC1A;
	Fri, 16 Oct 2009 20:52:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9GKqjUN013244;
	Fri, 16 Oct 2009 20:52:45 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9GKqjOd013242;
	Fri, 16 Oct 2009 20:52:45 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <200910162052.n9GKqjOd013242@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Fri, 16 Oct 2009 20:52:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198175 - head/usr.bin/touch
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2009 20:52:45 -0000

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);
 }