[Midnightbsd-cvs] src [11228] trunk/sbin/dumpfs/dumpfs.c: sync with freebsd 10 stable

[laffer1 at midnightbsd.org]

Revision: 11228
          http://svnweb.midnightbsd.org/src/?rev=11228
Author:   laffer1
Date:     2018-07-01 17:09:49 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync with freebsd 10 stable

Modified Paths:
--------------
    trunk/sbin/dumpfs/Makefile
    trunk/sbin/dumpfs/dumpfs.8
    trunk/sbin/dumpfs/dumpfs.c

Property Changed:
----------------
    trunk/sbin/dumpfs/dumpfs.8

Modified: trunk/sbin/dumpfs/Makefile
===================================================================
--- trunk/sbin/dumpfs/Makefile	2018-07-01 21:09:18 UTC (rev 11227)
+++ trunk/sbin/dumpfs/Makefile	2018-07-01 21:09:49 UTC (rev 11228)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/dumpfs/Makefile 198236 2009-10-19 16:00:24Z ru $
 
 PROG=	dumpfs
 WARNS?=	2

Modified: trunk/sbin/dumpfs/dumpfs.8
===================================================================
--- trunk/sbin/dumpfs/dumpfs.8	2018-07-01 21:09:18 UTC (rev 11227)
+++ trunk/sbin/dumpfs/dumpfs.8	2018-07-01 21:09:49 UTC (rev 11228)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/dumpfs/dumpfs.8 293693 2016-01-11 20:11:41Z trasz $
 .\"
 .Dd May 16, 2013
 .Dt DUMPFS 8
@@ -98,10 +99,9 @@
 flag is needed if the filesystem uses
 .Xr gjournal 8 .
 .Sh SEE ALSO
-.Xr disktab 5 ,
 .Xr fs 5 ,
-.Xr disklabel 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8 ,
 .Xr tunefs 8
 .Sh HISTORY


Property changes on: trunk/sbin/dumpfs/dumpfs.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/dumpfs/dumpfs.c
===================================================================
--- trunk/sbin/dumpfs/dumpfs.c	2018-07-01 21:09:18 UTC (rev 11227)
+++ trunk/sbin/dumpfs/dumpfs.c	2018-07-01 21:09:49 UTC (rev 11228)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2009 Robert N. M. Watson
  * All rights reserved.
@@ -53,7 +54,7 @@
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$MidnightBSD$";
+  "$FreeBSD: stable/10/sbin/dumpfs/dumpfs.c 283899 2015-06-02 01:55:54Z ae $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -77,18 +78,18 @@
 #define	afs	disk.d_fs
 #define	acg	disk.d_cg
 
-struct uufsd disk;
+static struct uufsd disk;
 
-int	dumpfs(const char *);
-int	dumpfsid(void);
-int	dumpcg(void);
-int	dumpfreespace(const char *, int);
-void	dumpfreespacecg(int);
-int	marshal(const char *);
-void	pbits(void *, int);
-void	pblklist(void *, int, off_t, int);
-void	ufserr(const char *);
-void	usage(void) __dead2;
+static int	dumpfs(const char *);
+static int	dumpfsid(void);
+static int	dumpcg(void);
+static int	dumpfreespace(const char *, int);
+static void	dumpfreespacecg(int);
+static int	marshal(const char *);
+static void	pbits(void *, int);
+static void	pblklist(void *, int, off_t, int);
+static void	ufserr(const char *);
+static void	usage(void) __dead2;
 
 int
 main(int argc, char *argv[])
@@ -143,7 +144,7 @@
 	exit(eval);
 }
 
-int
+static int
 dumpfsid(void)
 {
 
@@ -151,7 +152,7 @@
 	return 0;
 }
 
-int
+static int
 dumpfs(const char *name)
 {
 	time_t fstime;
@@ -165,7 +166,7 @@
 		fstime = afs.fs_time;
 		printf("magic\t%x (UFS2)\ttime\t%s",
 		    afs.fs_magic, ctime(&fstime));
-		printf("superblock location\t%jd\tid\t[ %x %x ]\n",
+		printf("superblock location\t%jd\tid\t[ %08x %08x ]\n",
 		    (intmax_t)afs.fs_sblockloc, afs.fs_id[0], afs.fs_id[1]);
 		printf("ncg\t%d\tsize\t%jd\tblocks\t%jd\n",
 		    afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize);
@@ -310,7 +311,7 @@
 	return (1);
 }
 
-int
+static int
 dumpcg(void)
 {
 	time_t cgtime;
@@ -371,7 +372,7 @@
 	return (0);
 }
 
-int
+static int
 dumpfreespace(const char *name, int fflag)
 {
 	int i;
@@ -387,7 +388,7 @@
 	return (1);
 }
 
-void
+static void
 dumpfreespacecg(int fflag)
 {
 
@@ -395,7 +396,7 @@
 	    fflag);
 }
 
-int
+static int
 marshal(const char *name)
 {
 	struct fs *fs;
@@ -450,7 +451,7 @@
 	return 0;
 }
 
-void
+static void
 pbits(void *vp, int max)
 {
 	int i;
@@ -472,7 +473,7 @@
 	printf("\n");
 }
 
-void
+static void
 pblklist(void *vp, int max, off_t offset, int fflag)
 {
 	int i, j;
@@ -493,7 +494,7 @@
 	}
 }
 
-void
+static void
 ufserr(const char *name)
 {
 	if (disk.d_error != NULL)
@@ -502,7 +503,7 @@
 		warn("%s", name);
 }
 
-void
+static void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: dumpfs [-flm] filesys | device\n");