Date: Thu, 20 Dec 2012 17:23:40 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244492 - projects/mtree/contrib/mtree Message-ID: <201212201723.qBKHNeg6088675@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Dec 20 17:23:40 2012 New Revision: 244492 URL: http://svnweb.freebsd.org/changeset/base/244492 Log: Loop back the merge of flavor support and remove obsolete code and documentation. We are now using 100% stock sources from NetBSD. Modified: projects/mtree/contrib/mtree/create.c projects/mtree/contrib/mtree/extern.h projects/mtree/contrib/mtree/mtree.8 projects/mtree/contrib/mtree/mtree.c projects/mtree/contrib/mtree/spec.c Modified: projects/mtree/contrib/mtree/create.c ============================================================================== --- projects/mtree/contrib/mtree/create.c Thu Dec 20 17:14:10 2012 (r244491) +++ projects/mtree/contrib/mtree/create.c Thu Dec 20 17:23:40 2012 (r244492) @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $ */ +/* $NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $"); #endif #endif /* not lint */ Modified: projects/mtree/contrib/mtree/extern.h ============================================================================== --- projects/mtree/contrib/mtree/extern.h Thu Dec 20 17:14:10 2012 (r244491) +++ projects/mtree/contrib/mtree/extern.h Thu Dec 20 17:23:40 2012 (r244492) @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.36 2012/10/05 01:26:56 christos Exp $ */ +/* $NetBSD: extern.h,v 1.37 2012/12/20 16:43:16 christos Exp $ */ /*- * Copyright (c) 1991, 1993 Modified: projects/mtree/contrib/mtree/mtree.8 ============================================================================== --- projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 17:14:10 2012 (r244491) +++ projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 17:23:40 2012 (r244492) @@ -1,4 +1,4 @@ -.\" $NetBSD: mtree.8,v 1.64 2012/12/12 15:52:10 christos Exp $ +.\" $NetBSD: mtree.8,v 1.65 2012/12/20 16:43:16 christos Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -56,7 +56,7 @@ .\" .\" @(#)mtree.8 8.2 (Berkeley) 12/11/93 .\" -.Dd October 4, 2012 +.Dd December 20, 2012 .Dt MTREE 8 .Os .Sh NAME @@ -192,16 +192,6 @@ and If no inclusion list is provided, the default is to display all files. .It Fl i If specified, set the schg and/or sappnd flags. -For compatiblity with -.Fx -if the -.Fl c -and -.Fl i -option are both passed, -then the -.Fl j -option is implied and a warning is emitted. .It Fl j Indent the output 4 spaces each time a directory level is descended when creating a specification with the @@ -721,7 +711,7 @@ to create directory hierarchies for, for The compatibility shims provided by the .Fl F option are incomplete by design. -Known limititations are described below. +Known limitations are described below. .Pp The .Sy freebsd9 Modified: projects/mtree/contrib/mtree/mtree.c ============================================================================== --- projects/mtree/contrib/mtree/mtree.c Thu Dec 20 17:14:10 2012 (r244491) +++ projects/mtree/contrib/mtree/mtree.c Thu Dec 20 17:23:40 2012 (r244492) @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.43 2012/12/12 15:51:41 christos Exp $ */ +/* $NetBSD: mtree.c,v 1.44 2012/12/20 16:43:16 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.43 2012/12/12 15:51:41 christos Exp $"); +__RCSID("$NetBSD: mtree.c,v 1.44 2012/12/20 16:43:16 christos Exp $"); #endif #endif /* not lint */ @@ -285,12 +285,6 @@ main(int argc, char **argv) if ((cflag && Cflag) || (cflag && Dflag) || (Cflag && Dflag)) mtree_err("-c, -C and -D flags are mutually exclusive"); - if (cflag && iflag) { - warnx("-c and -i specified, setting -j and unsetting -i"); - iflag = 0; - jflag = 1; - } - if (iflag && mflag) mtree_err("-i and -m flags are mutually exclusive"); Modified: projects/mtree/contrib/mtree/spec.c ============================================================================== --- projects/mtree/contrib/mtree/spec.c Thu Dec 20 17:14:10 2012 (r244491) +++ projects/mtree/contrib/mtree/spec.c Thu Dec 20 17:23:40 2012 (r244492) @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.84 2012/10/07 18:40:49 christos Exp $ */ +/* $NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: spec.c,v 1.84 2012/10/07 18:40:49 christos Exp $"); +__RCSID("$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $"); #endif #endif /* not lint */ @@ -415,16 +415,16 @@ dump_nodes(const char *dir, NODE *root, char * vispath(const char *path) { - const char extra[] = { ' ', '\t', '\n', '\\', '\0' }; - const char extra_glob[] = { ' ', '\t', '\n', '\\', '#', '*', '?', - '[', '\0' }; + static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; + static const char extra_glob[] = { ' ', '\t', '\n', '\\', '#', '*', + '?', '[', '\0' }; static char pathbuf[4*MAXPATHLEN + 1]; if (flavor == F_NETBSD6) strsvis(pathbuf, path, VIS_CSTYLE, extra); else strsvis(pathbuf, path, VIS_OCTAL, extra_glob); - return(pathbuf); + return pathbuf; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212201723.qBKHNeg6088675>