From owner-svn-src-head@FreeBSD.ORG  Tue Jun  5 16:16:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15182106566B;
	Tue,  5 Jun 2012 16:16:34 +0000 (UTC)
	(envelope-from ache@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D1C58FC15;
	Tue,  5 Jun 2012 16:16:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q55GGXkS029766;
	Tue, 5 Jun 2012 16:16:33 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q55GGXt7029764;
	Tue, 5 Jun 2012 16:16:33 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201206051616.q55GGXt7029764@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Tue, 5 Jun 2012 16:16:33 +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: r236618 - head/lib/libc/stdlib
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2012 16:16:34 -0000

Author: ache
Date: Tue Jun  5 16:16:33 2012
New Revision: 236618
URL: http://svn.freebsd.org/changeset/base/236618

Log:
  1) Although unpublished version of standard
  http://austingroupbugs.net/view.php?id=385#c713
  (Resolved state) recommend this way for the current standard (called
  "earlier" in the text)
  
  "However, earlier versions of this standard did not require this, and the
  same example had to be written as:
  
      // buf was obtained by malloc(buflen)
      ret = write(fd, buf, buflen);
      if (ret < 0) {
          int save = errno;
          free(buf);
          errno = save;
          return ret;
      }
  "
  
  from feedback I have for previous commit it seems that many people prefer
  to avoid mass code change needed for current standard compliance
  and prefer to track unpublished standard instead, which requires now
  that free() itself must save errno, not its usage code.
  
  So, I back out "save errno across free()" part of previous commit,
  and will fill PR for changing free() isntead.
  
  2) Remove now unused serrno.
  
  MFC after:      1 week

Modified:
  head/lib/libc/stdlib/realpath.c

Modified: head/lib/libc/stdlib/realpath.c
==============================================================================
--- head/lib/libc/stdlib/realpath.c	Tue Jun  5 14:19:59 2012	(r236617)
+++ head/lib/libc/stdlib/realpath.c	Tue Jun  5 16:16:33 2012	(r236618)
@@ -54,7 +54,7 @@ realpath(const char * __restrict path, c
 	char *p, *q, *s;
 	size_t left_len, resolved_len;
 	unsigned symlinks;
-	int m, serrno, slen;
+	int m, slen;
 	char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
 
 	if (path == NULL) {
@@ -82,11 +82,9 @@ realpath(const char * __restrict path, c
 		left_len = strlcpy(left, path + 1, sizeof(left));
 	} else {
 		if (getcwd(resolved, PATH_MAX) == NULL) {
-			if (m) {
-				serrno = errno;
+			if (m)
 				free(resolved);
-				errno = serrno;
-			} else {
+			else {
 				resolved[0] = '.';
 				resolved[1] = '\0';
 			}
@@ -144,11 +142,8 @@ realpath(const char * __restrict path, c
 			 * occurence to not implement lookahead.
 			 */
 			if (lstat(resolved, &sb) != 0) {
-				if (m) {
-					serrno = errno;
+				if (m)
 					free(resolved);
-					errno = serrno;
-				}
 				return (NULL);
 			}
 			if (!S_ISDIR(sb.st_mode)) {
@@ -188,11 +183,8 @@ realpath(const char * __restrict path, c
 		if (lstat(resolved, &sb) != 0) {
 			if (errno != ENOENT || p != NULL)
 				errno = ENOTDIR;
-			if (m) {
-				serrno = errno;
+			if (m)
 				free(resolved);
-				errno = serrno;
-			}
 			return (NULL);
 		}
 		if (S_ISLNK(sb.st_mode)) {
@@ -204,11 +196,8 @@ realpath(const char * __restrict path, c
 			}
 			slen = readlink(resolved, symlink, sizeof(symlink) - 1);
 			if (slen < 0) {
-				if (m) {
-					serrno = errno;
+				if (m)
 					free(resolved);
-					errno = serrno;
-				}
 				return (NULL);
 			}
 			symlink[slen] = '\0';