[Midnightbsd-cvs] src [10331] trunk/usr.sbin/snapinfo/snapinfo.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10331
          http://svnweb.midnightbsd.org/src/?rev=10331
Author:   laffer1
Date:     2018-06-03 15:52:30 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/snapinfo/Makefile
    trunk/usr.sbin/snapinfo/snapinfo.8
    trunk/usr.sbin/snapinfo/snapinfo.c

Property Changed:
----------------
    trunk/usr.sbin/snapinfo/snapinfo.8

Modified: trunk/usr.sbin/snapinfo/Makefile
===================================================================
--- trunk/usr.sbin/snapinfo/Makefile	2018-06-03 19:51:36 UTC (rev 10330)
+++ trunk/usr.sbin/snapinfo/Makefile	2018-06-03 19:52:30 UTC (rev 10331)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/snapinfo/Makefile 148197 2005-07-20 18:59:25Z marks $
 #
 
 PROG=	snapinfo

Modified: trunk/usr.sbin/snapinfo/snapinfo.8
===================================================================
--- trunk/usr.sbin/snapinfo/snapinfo.8	2018-06-03 19:51:36 UTC (rev 10330)
+++ trunk/usr.sbin/snapinfo/snapinfo.8	2018-06-03 19:52:30 UTC (rev 10331)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"
 .\" Copyright (c) 2005 Mark Santcroos <marks at FreeBSD.org>
 .\" All rights reserved.
@@ -22,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/snapinfo/snapinfo.8 208291 2010-05-19 08:57:53Z uqs $
 .\"
 .Dd July 20, 2005
 .Dt SNAPINFO 8


Property changes on: trunk/usr.sbin/snapinfo/snapinfo.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/snapinfo/snapinfo.c
===================================================================
--- trunk/usr.sbin/snapinfo/snapinfo.c	2018-06-03 19:51:36 UTC (rev 10330)
+++ trunk/usr.sbin/snapinfo/snapinfo.c	2018-06-03 19:52:30 UTC (rev 10331)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2005 Mark Santcroos <marks at freebsd.org>
  *
@@ -21,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/snapinfo/snapinfo.c 241015 2012-09-27 23:31:19Z mdf $
  *
  */
 
@@ -34,19 +35,21 @@
 #include <errno.h>
 #include <ftw.h>
 #include <libufs.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-void	find_inum(char *path);
-void	usage(void);
-int	compare_function(const char *, const struct stat *, int, struct FTW *);
-int	find_snapshot(struct statfs *sfs);
+static void	find_inum(char *path);
+static void	usage(void);
+static int	compare_function(const char *, const struct stat *,
+		    int, struct FTW *);
+static int	find_snapshot(struct statfs *sfs);
 
-int verbose;
-int cont_search;
-uint32_t inode;
+static int	verbose;
+static int	cont_search;
+static uint32_t	inode;
 
 int
 main(int argc, char **argv)
@@ -112,7 +115,7 @@
 	return (0);
 }
 
-int
+static int
 find_snapshot(struct statfs *sfs)
 {
 	struct uufsd disk;
@@ -138,7 +141,7 @@
 	return 0;
 }
 
-int
+static int
 compare_function(const char *path, const struct stat *st, int flags,
     struct FTW * ftwv __unused)
 {
@@ -148,7 +151,7 @@
 			printf("\tsnapshot ");
 		printf("%s", path);
 		if (verbose)
-			printf(" (inode %d)", st->st_ino);
+			printf(" (inode %ju)", (uintmax_t)st->st_ino);
 		printf("\n");
 		if (!cont_search)
 			return (EEXIST);
@@ -157,7 +160,7 @@
 	return (0);
 }
 
-void
+static void
 find_inum(char *path)
 {
 	int ret;
@@ -169,7 +172,7 @@
 	}
 }
 
-void
+static void
 usage(void)
 {