summaryrefslogtreecommitdiffstats
path: root/contrib/mtree/create.c
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2013-11-26 16:12:40 +0000
committerbrooks <brooks@FreeBSD.org>2013-11-26 16:12:40 +0000
commitc545463f87891b7cabcb279987652b0665a4135c (patch)
tree96ca18958b5e248a85dc780cb4ac8f74ae94b81c /contrib/mtree/create.c
parent67681dff483bad8dc076fb5caa649e0ce4944257 (diff)
downloadFreeBSD-src-c545463f87891b7cabcb279987652b0665a4135c.zip
FreeBSD-src-c545463f87891b7cabcb279987652b0665a4135c.tar.gz
MFC r258437:
Sync with NetBSD. The functional change is to make the output when comparing a directory to an mtree file more compatible with fmtree when FreeBSD 9 compatiblity mode is on. This output is clearly intended for humans not computers, but some tools such as mergemaster's -U option rely on it. Approved by: re (glebius)
Diffstat (limited to 'contrib/mtree/create.c')
-rw-r--r--contrib/mtree/create.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c
index 516977e..1e44661 100644
--- a/contrib/mtree/create.c
+++ b/contrib/mtree/create.c
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $ */
+/* $NetBSD: create.c,v 1.72 2013/10/17 17:22:59 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.71 2013/10/16 17:24:20 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $");
#endif
#endif /* not lint */
@@ -53,9 +53,9 @@ __RCSID("$NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $");
#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdarg.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
OpenPOWER on IntegriCloud