From owner-svn-src-stable-8@FreeBSD.ORG  Fri Oct 22 06:56:11 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA5F6106566C;
	Fri, 22 Oct 2010 06:56:11 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C8B1B8FC16;
	Fri, 22 Oct 2010 06:56:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9M6uBZF016340;
	Fri, 22 Oct 2010 06:56:11 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9M6uBLF016338;
	Fri, 22 Oct 2010 06:56:11 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201010220656.o9M6uBLF016338@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 22 Oct 2010 06:56:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214196 - stable/8/bin/sh
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Oct 2010 06:56:12 -0000

Author: obrien
Date: Fri Oct 22 06:56:11 2010
New Revision: 214196
URL: http://svn.freebsd.org/changeset/base/214196

Log:
  Reduce diff to 9-CURRENT.

Modified:
  stable/8/bin/sh/expand.c

Modified: stable/8/bin/sh/expand.c
==============================================================================
--- stable/8/bin/sh/expand.c	Fri Oct 22 06:39:14 2010	(r214195)
+++ stable/8/bin/sh/expand.c	Fri Oct 22 06:56:11 2010	(r214196)
@@ -1084,15 +1084,14 @@ ifsbreakup(char *string, struct arglist 
 }
 
 
+static char expdir[PATH_MAX];
+#define expdir_end (expdir + sizeof(expdir))
+
 /*
  * Perform pathname generation and remove control characters.
  * At this point, the only control characters should be CTLESC and CTLQUOTEMARK.
  * The results are stored in the list exparg.
  */
-
-static char expdir[PATH_MAX];
-#define expdir_end (expdir + sizeof(expdir))
-
 static void
 expandmeta(struct strlist *str, int flag __unused)
 {