From owner-svn-src-all@freebsd.org  Sat Jul 30 03:11:55 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66111BA7815;
 Sat, 30 Jul 2016 03:11:55 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 36D991743;
 Sat, 30 Jul 2016 03:11:55 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6U3BsvT009006;
 Sat, 30 Jul 2016 03:11:54 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6U3Bs2r009005;
 Sat, 30 Jul 2016 03:11:54 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201607300311.u6U3Bs2r009005@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ache set sender to
 ache@FreeBSD.org using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 30 Jul 2016 03:11:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303536 - 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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2016 03:11:55 -0000

Author: ache
Date: Sat Jul 30 03:11:54 2016
New Revision: 303536
URL: https://svnweb.freebsd.org/changeset/base/303536

Log:
  Rework r303074 case 4. Don't immediatelly skip directory entries which
  cause MAXPATHLEN exceeded. Process them first through gl_errfunc() and
  GLOB_ERR.

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

Modified: head/lib/libc/gen/glob.c
==============================================================================
--- head/lib/libc/gen/glob.c	Sat Jul 30 03:11:53 2016	(r303535)
+++ head/lib/libc/gen/glob.c	Sat Jul 30 03:11:54 2016	(r303536)
@@ -803,6 +803,13 @@ glob3(Char *pathbuf, Char *pathend, Char
 			}
 			sc += clen;
 		}
+		if (too_long && ((pglob->gl_errfunc != NULL &&
+		    pglob->gl_errfunc(buf, ENAMETOOLONG)) ||
+		    (pglob->gl_flags & GLOB_ERR))) {
+			errno = ENAMETOOLONG;
+			err = GLOB_ABORTED;
+			break;
+		}
 		if (too_long || !match(pathend, pattern, restpattern)) {
 			*pathend = EOS;
 			errno = 0;