From owner-svn-src-all@FreeBSD.ORG  Thu Jul 24 20:44:30 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED8B92EC;
 Thu, 24 Jul 2014 20:44:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB7C82639;
 Thu, 24 Jul 2014 20:44:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OKiUWd068822;
 Thu, 24 Jul 2014 20:44:30 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OKiUIs068821;
 Thu, 24 Jul 2014 20:44:30 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201407242044.s6OKiUIs068821@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 24 Jul 2014 20:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269079 - head/lib/libc/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Thu, 24 Jul 2014 20:44:31 -0000

Author: jhb
Date: Thu Jul 24 20:44:30 2014
New Revision: 269079
URL: http://svnweb.freebsd.org/changeset/base/269079

Log:
  POSIX says that passing a location returned by telldir() to seekdir()
  after an intervening call to rewinddir() is undefined, so reclaim any
  pending telldir() cookies in the directory when rewinddir() is called.
  
  CR:		D459
  Reviewed by:	jilles
  MFC after:	1 week

Modified:
  head/lib/libc/gen/rewinddir.c

Modified: head/lib/libc/gen/rewinddir.c
==============================================================================
--- head/lib/libc/gen/rewinddir.c	Thu Jul 24 20:16:45 2014	(r269078)
+++ head/lib/libc/gen/rewinddir.c	Thu Jul 24 20:44:30 2014	(r269079)
@@ -58,6 +58,7 @@ rewinddir(dirp)
 		dirp->dd_seek = 0;
 	}
 	dirp->dd_loc = 0;
+	_reclaim_telldir(dirp);
 	if (__isthreaded)
 		_pthread_mutex_unlock(&dirp->dd_lock);
 }