Module Name: src
Committed By: christos
Date: Thu Dec 20 19:09:25 UTC 2012
Modified Files:
src/usr.sbin/mtree: misc.c mtree.c
Log Message:
move flavor to misc.c because pax needs it.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/mtree/misc.c
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/mtree/mtree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/misc.c
diff -u src/usr.sbin/mtree/misc.c:1.33 src/usr.sbin/mtree/misc.c:1.34
--- src/usr.sbin/mtree/misc.c:1.33 Wed Dec 12 10:51:04 2012
+++ src/usr.sbin/mtree/misc.c Thu Dec 20 14:09:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.33 2012/12/12 15:51:04 christos Exp $ */
+/* $NetBSD: misc.c,v 1.34 2012/12/20 19:09:25 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: misc.c,v 1.33 2012/12/12 15:51:04 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.34 2012/12/20 19:09:25 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -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 */
Index: src/usr.sbin/mtree/mtree.c
diff -u src/usr.sbin/mtree/mtree.c:1.45 src/usr.sbin/mtree/mtree.c:1.46
--- src/usr.sbin/mtree/mtree.c:1.45 Thu Dec 20 13:58:37 2012
+++ src/usr.sbin/mtree/mtree.c Thu Dec 20 14:09:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mtree.c,v 1.45 2012/12/20 18:58:37 mlelstv Exp $ */
+/* $NetBSD: mtree.c,v 1.46 2012/12/20 19:09:25 christos Exp $ */
/*-
* Copyright (c) 1989, 1990, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mtree.c,v 1.45 2012/12/20 18:58:37 mlelstv Exp $");
+__RCSID("$NetBSD: mtree.c,v 1.46 2012/12/20 19:09:25 christos Exp $");
#endif
#endif /* not lint */
@@ -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;