From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 16:21:01 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 05CBF858;
Fri, 21 Dec 2012 16:21:01 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DDD988FC14;
Fri, 21 Dec 2012 16:21:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLGL0Br094864;
Fri, 21 Dec 2012 16:21:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLGL0kU094862;
Fri, 21 Dec 2012 16:21:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211621.qBLGL0kU094862@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 16:21:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244539 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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 Dec 2012 16:21:01 -0000
Author: brooks
Date: Fri Dec 21 16:21:00 2012
New Revision: 244539
URL: http://svnweb.freebsd.org/changeset/base/244539
Log:
Move the flavor to misc.c as done upstream to support programs that use
parts of the mtree source.
Modified:
projects/mtree/contrib/mtree/misc.c
projects/mtree/contrib/mtree/mtree.c
Modified: projects/mtree/contrib/mtree/misc.c
==============================================================================
--- projects/mtree/contrib/mtree/misc.c Fri Dec 21 15:54:13 2012 (r244538)
+++ projects/mtree/contrib/mtree/misc.c Fri Dec 21 16:21:00 2012 (r244539)
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: misc.c,v 1.33 2012/12/
#include "extern.h"
+enum flavor flavor = F_MTREE;
+
typedef struct _key {
const char *name; /* key name */
u_int val; /* value */
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Fri Dec 21 15:54:13 2012 (r244538)
+++ projects/mtree/contrib/mtree/mtree.c Fri Dec 21 16:21:00 2012 (r244539)
@@ -62,7 +62,6 @@ int ftsoptions = FTS_PHYSICAL;
int bflag, cflag, Cflag, dflag, Dflag, eflag, iflag, jflag, lflag, mflag,
nflag, qflag, rflag, sflag, tflag, uflag, Uflag, wflag;
char fullpath[MAXPATHLEN];
-enum flavor flavor = F_MTREE;
static struct {
enum flavor flavor;