From owner-svn-src-all@FreeBSD.ORG  Wed Dec 28 23:40:47 2011
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 459351065672;
	Wed, 28 Dec 2011 23:40:47 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3481D8FC12;
	Wed, 28 Dec 2011 23:40:47 +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 pBSNeltS029979;
	Wed, 28 Dec 2011 23:40:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBSNelmW029977;
	Wed, 28 Dec 2011 23:40:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201112282340.pBSNelmW029977@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 28 Dec 2011 23:40:47 +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: r228942 - head/bin/sh
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: Wed, 28 Dec 2011 23:40:47 -0000

Author: jilles
Date: Wed Dec 28 23:40:46 2011
New Revision: 228942
URL: http://svn.freebsd.org/changeset/base/228942

Log:
  sh: Use dirent.d_type in pathname generation.
  
  This improves performance for globs where a slash or another component
  follows a component with metacharacters by eliminating unnecessary attempts
  to open directories that are not.

Modified:
  head/bin/sh/expand.c

Modified: head/bin/sh/expand.c
==============================================================================
--- head/bin/sh/expand.c	Wed Dec 28 23:30:17 2011	(r228941)
+++ head/bin/sh/expand.c	Wed Dec 28 23:40:46 2011	(r228942)
@@ -1292,6 +1292,10 @@ expmeta(char *enddir, char *name)
 			if (atend)
 				addfname(expdir);
 			else {
+				if (dp->d_type != DT_UNKNOWN &&
+				    dp->d_type != DT_DIR &&
+				    dp->d_type != DT_LNK)
+					continue;
 				if (enddir + namlen + 2 > expdir_end)
 					continue;
 				enddir[namlen] = '/';