From owner-svn-src-projects@FreeBSD.ORG  Fri Sep 21 20:03:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2F33A1065672;
	Fri, 21 Sep 2012 20:03:14 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B0D28FC12;
	Fri, 21 Sep 2012 20:03:14 +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 q8LK3D7f097789;
	Fri, 21 Sep 2012 20:03:13 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8LK3DQq097787;
	Fri, 21 Sep 2012 20:03:13 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201209212003.q8LK3DQq097787@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Sep 2012 20:03:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240789 - projects/mtree/contrib/mtree
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Sep 2012 20:03:14 -0000

Author: brooks
Date: Fri Sep 21 20:03:13 2012
New Revision: 240789
URL: http://svn.freebsd.org/changeset/base/240789

Log:
  Escape literal glob characters in files to avoid unexpected effects when
  using the resulting spec file to update.
  
  Obtained from:	FreeBSD (phk)

Modified:
  projects/mtree/contrib/mtree/spec.c

Modified: projects/mtree/contrib/mtree/spec.c
==============================================================================
--- projects/mtree/contrib/mtree/spec.c	Fri Sep 21 19:30:36 2012	(r240788)
+++ projects/mtree/contrib/mtree/spec.c	Fri Sep 21 20:03:13 2012	(r240789)
@@ -415,7 +415,8 @@ dump_nodes(const char *dir, NODE *root, 
 char *
 vispath(const char *path)
 {
-	const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' };
+	const char extra[] = { ' ', '\t', '\n', '\\', '#', '*', '?', '[',
+	    '#', '\0' };
 	static char pathbuf[4*MAXPATHLEN + 1];
 
 	strsvis(pathbuf, path, VIS_CSTYLE, extra);