Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/mtree move flavor to misc.c because pax needs it.



details:   https://anonhg.NetBSD.org/src/rev/51db0dcc51e5
branches:  trunk
changeset: 783434:51db0dcc51e5
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 20 19:09:25 2012 +0000

description:
move flavor to misc.c because pax needs it.

diffstat:

 usr.sbin/mtree/misc.c  |  6 ++++--
 usr.sbin/mtree/mtree.c |  5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r f7da1cb147ba -r 51db0dcc51e5 usr.sbin/mtree/misc.c
--- a/usr.sbin/mtree/misc.c     Thu Dec 20 18:58:37 2012 +0000
+++ b/usr.sbin/mtree/misc.c     Thu Dec 20 19:09:25 2012 +0000
@@ -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 @@
 
 #include "extern.h"
 
+enum flavor    flavor = F_MTREE;
+
 typedef struct _key {
        const char      *name;          /* key name */
        u_int           val;            /* value */
diff -r f7da1cb147ba -r 51db0dcc51e5 usr.sbin/mtree/mtree.c
--- a/usr.sbin/mtree/mtree.c    Thu Dec 20 18:58:37 2012 +0000
+++ b/usr.sbin/mtree/mtree.c    Thu Dec 20 19:09:25 2012 +0000
@@ -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 @@
 #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    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;



Home | Main Index | Thread Index | Old Index