[Midnightbsd-cvs] src [10382] trunk/usr.sbin/mtree/spec.c: sync mtree with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 19:28:12 EDT 2018
Revision: 10382
http://svnweb.midnightbsd.org/src/?rev=10382
Author: laffer1
Date: 2018-06-03 19:28:11 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync mtree with freebsd
Modified Paths:
--------------
trunk/usr.sbin/mtree/Makefile
trunk/usr.sbin/mtree/compare.c
trunk/usr.sbin/mtree/create.c
trunk/usr.sbin/mtree/excludes.c
trunk/usr.sbin/mtree/extern.h
trunk/usr.sbin/mtree/misc.c
trunk/usr.sbin/mtree/mtree.5
trunk/usr.sbin/mtree/mtree.8
trunk/usr.sbin/mtree/mtree.c
trunk/usr.sbin/mtree/spec.c
Property Changed:
----------------
trunk/usr.sbin/mtree/mtree.5
trunk/usr.sbin/mtree/mtree.8
Modified: trunk/usr.sbin/mtree/Makefile
===================================================================
--- trunk/usr.sbin/mtree/Makefile 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/Makefile 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/mtree/Makefile 262654 2014-03-01 13:00:40Z tijl $
.include <bsd.own.mk>
@@ -14,10 +15,10 @@
DPADD= ${LIBMD}
LDADD= -lmd
-#.if ${MK_NMTREE} == "no"
+.if ${MK_NMTREE} == "no"
LINKS= ${BINDIR}/fmtree ${BINDIR}/mtree
MLINKS= fmtree.8 mtree.8
-#.endif
+.endif
CLEANFILES+= fmtree.8
Modified: trunk/usr.sbin/mtree/compare.c
===================================================================
--- trunk/usr.sbin/mtree/compare.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/compare.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/compare.c 205793 2010-03-28 13:16:08Z ed $");
#include <sys/param.h>
#include <sys/stat.h>
Modified: trunk/usr.sbin/mtree/create.c
===================================================================
--- trunk/usr.sbin/mtree/create.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/create.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/create.c 255483 2013-09-12 00:14:25Z delphij $");
#include <sys/param.h>
#include <sys/stat.h>
Modified: trunk/usr.sbin/mtree/excludes.c
===================================================================
--- trunk/usr.sbin/mtree/excludes.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/excludes.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright 2000 Massachusetts Institute of Technology
*
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/excludes.c 121300 2003-10-21 08:27:05Z phk $");
#include <sys/types.h>
#include <sys/time.h> /* XXX for mtree.h */
Modified: trunk/usr.sbin/mtree/extern.h
===================================================================
--- trunk/usr.sbin/mtree/extern.h 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/extern.h 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/mtree/extern.h 124389 2004-01-11 19:38:48Z phk $
*/
extern uint32_t crc_total;
Modified: trunk/usr.sbin/mtree/misc.c
===================================================================
--- trunk/usr.sbin/mtree/misc.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/misc.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
#endif /*not lint */
#endif
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/misc.c 160083 2006-07-03 10:55:22Z maxim $");
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/usr.sbin/mtree/mtree.5
===================================================================
--- trunk/usr.sbin/mtree/mtree.5 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/mtree.5 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -26,7 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/mtree/mtree.5 262654 2014-03-01 13:00:40Z tijl $
.\"
.Dd December 31, 2007
.Dt MTREE 5
@@ -223,7 +224,6 @@
socket
.El
.El
-.Pp
.Sh SEE ALSO
.Xr cksum 1 ,
.Xr find 1 ,
Property changes on: trunk/usr.sbin/mtree/mtree.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/mtree/mtree.8
===================================================================
--- trunk/usr.sbin/mtree/mtree.8 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/mtree.8 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -26,7 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/mtree/mtree.8 208056 2010-05-14 01:45:05Z brueffer $
.\"
.Dd June 16, 2007
.Dt MTREE 8
Property changes on: trunk/usr.sbin/mtree/mtree.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/mtree/mtree.c
===================================================================
--- trunk/usr.sbin/mtree/mtree.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/mtree.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +40,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/mtree.c 241777 2012-10-20 10:33:15Z ed $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -52,7 +53,8 @@
#include "extern.h"
int ftsoptions = FTS_PHYSICAL;
-int cflag, dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, Uflag, wflag;
+int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, wflag;
+static int cflag, Uflag;
u_int keys;
char fullpath[MAXPATHLEN];
Modified: trunk/usr.sbin/mtree/spec.c
===================================================================
--- trunk/usr.sbin/mtree/spec.c 2018-06-03 23:27:10 UTC (rev 10381)
+++ trunk/usr.sbin/mtree/spec.c 2018-06-03 23:28:11 UTC (rev 10382)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +34,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/mtree/spec.c 229403 2012-01-03 18:51:58Z ed $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -73,7 +74,7 @@
continue;
/* Find end of line. */
- if ((p = index(buf, '\n')) == NULL)
+ if ((p = strchr(buf, '\n')) == NULL)
errx(1, "line %d too long", lineno);
/* See if next line is continuation line. */
@@ -118,7 +119,7 @@
continue;
}
- if (index(p, '/'))
+ if (strchr(p, '/'))
errx(1, "line %d: slash character in file name",
lineno);
More information about the Midnightbsd-cvs
mailing list