From owner-svn-src-all@FreeBSD.ORG  Tue Sep 18 13:13:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E3EF71065670;
	Tue, 18 Sep 2012 13:13:28 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE7B48FC15;
	Tue, 18 Sep 2012 13:13:28 +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 q8IDDSNb097920;
	Tue, 18 Sep 2012 13:13:28 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IDDSG9097917;
	Tue, 18 Sep 2012 13:13:28 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201209181313.q8IDDSG9097917@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 18 Sep 2012 13:13:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240648 - releng/9.1/lib/libc/stdlib
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: Tue, 18 Sep 2012 13:13:29 -0000

Author: emaste
Date: Tue Sep 18 13:13:28 2012
New Revision: 240648
URL: http://svn.freebsd.org/changeset/base/240648

Log:
  MFC r240412:
  
    According to a clarification at http://austingroupbugs.net/view.php?id=503
    ptsname may set errno, so avoid saving and restoring errno across the
    function.
  
  PR: standards/171572
  Approved by: re
  Sponsored by: ADARA Networks

Modified:
  releng/9.1/lib/libc/stdlib/ptsname.3
  releng/9.1/lib/libc/stdlib/ptsname.c
Directory Properties:
  releng/9.1/lib/libc/   (props changed)

Modified: releng/9.1/lib/libc/stdlib/ptsname.3
==============================================================================
--- releng/9.1/lib/libc/stdlib/ptsname.3	Tue Sep 18 13:03:00 2012	(r240647)
+++ releng/9.1/lib/libc/stdlib/ptsname.3	Tue Sep 18 13:13:28 2012	(r240648)
@@ -102,7 +102,8 @@ of the slave device on success; otherwis
 pointer is returned.
 .Sh ERRORS
 The
-.Fn grantpt
+.Fn grantpt ,
+.Fn ptsname
 and
 .Fn unlockpt
 functions may fail and set

Modified: releng/9.1/lib/libc/stdlib/ptsname.c
==============================================================================
--- releng/9.1/lib/libc/stdlib/ptsname.c	Tue Sep 18 13:03:00 2012	(r240647)
+++ releng/9.1/lib/libc/stdlib/ptsname.c	Tue Sep 18 13:13:28 2012	(r240648)
@@ -77,7 +77,6 @@ ptsname(int fildes)
 {
 	static char pt_slave[sizeof _PATH_DEV + SPECNAMELEN] = _PATH_DEV;
 	char *ret = NULL;
-	int sverrno = errno;
 
 	/* Make sure fildes points to a master device. */
 	if (__isptmaster(fildes) != 0)
@@ -87,7 +86,6 @@ ptsname(int fildes)
 	    sizeof pt_slave - (sizeof _PATH_DEV - 1)) != NULL)
 		ret = pt_slave;
 
-done:	/* Make sure ptsname() does not overwrite errno. */
-	errno = sverrno;
+done:
 	return (ret);
 }