From owner-svn-src-stable@FreeBSD.ORG  Thu May 20 23:06:53 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A1BC106566B;
	Thu, 20 May 2010 23:06:53 +0000 (UTC)
	(envelope-from gordon@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 886038FC0C;
	Thu, 20 May 2010 23:06:53 +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 o4KN6raE036233;
	Thu, 20 May 2010 23:06:53 GMT (envelope-from gordon@svn.freebsd.org)
Received: (from gordon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4KN6rTt036231;
	Thu, 20 May 2010 23:06:53 GMT (envelope-from gordon@svn.freebsd.org)
Message-Id: <201005202306.o4KN6rTt036231@svn.freebsd.org>
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Thu, 20 May 2010 23:06:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208366 - stable/7/lib/libc/gen
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 May 2010 23:06:53 -0000

Author: gordon
Date: Thu May 20 23:06:53 2010
New Revision: 208366
URL: http://svn.freebsd.org/changeset/base/208366

Log:
  MFC r207981:
   Fix a bug due to a type conversion from 64 to 32 bits. The side effect of
   this type conversion is the high bits which were used to indicate if a
   special character was a literal or special were dropped. As a result, all
   special character were treated as special, even if they were supposed to
   be literals.
  
  Approved by:	mentor (wes@)

Modified:
  stable/7/lib/libc/gen/glob.c
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/gen/glob.c
==============================================================================
--- stable/7/lib/libc/gen/glob.c	Thu May 20 22:12:36 2010	(r208365)
+++ stable/7/lib/libc/gen/glob.c	Thu May 20 23:06:53 2010	(r208366)
@@ -433,9 +433,9 @@ static int
 glob0(const Char *pattern, glob_t *pglob, size_t *limit)
 {
 	const Char *qpatnext;
-	int c, err;
+	int err;
 	size_t oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN];
+	Char *bufnext, c, patbuf[MAXPATHLEN];
 
 	qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
 	oldpathc = pglob->gl_pathc;