[Midnightbsd-cvs] src [11095] trunk/sbin/quotacheck: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 11095
          http://svnweb.midnightbsd.org/src/?rev=11095
Author:   laffer1
Date:     2018-06-19 14:08:09 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/sbin/quotacheck/Makefile
    trunk/sbin/quotacheck/preen.c
    trunk/sbin/quotacheck/quotacheck.8
    trunk/sbin/quotacheck/quotacheck.c
    trunk/sbin/quotacheck/quotacheck.h

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

Modified: trunk/sbin/quotacheck/Makefile
===================================================================
--- trunk/sbin/quotacheck/Makefile	2018-06-19 18:07:45 UTC (rev 11094)
+++ trunk/sbin/quotacheck/Makefile	2018-06-19 18:08:09 UTC (rev 11095)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sbin/quotacheck/Makefile 207736 2010-05-07 00:41:12Z mckusick $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck

Modified: trunk/sbin/quotacheck/preen.c
===================================================================
--- trunk/sbin/quotacheck/preen.c	2018-06-19 18:07:45 UTC (rev 11094)
+++ trunk/sbin/quotacheck/preen.c	2018-06-19 18:08:09 UTC (rev 11095)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $	*/
 
 /*
@@ -28,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/quotacheck/preen.c 207736 2010-05-07 00:41:12Z mckusick $
  */
 
 #include <sys/cdefs.h>

Modified: trunk/sbin/quotacheck/quotacheck.8
===================================================================
--- trunk/sbin/quotacheck/quotacheck.8	2018-06-19 18:07:45 UTC (rev 11094)
+++ trunk/sbin/quotacheck/quotacheck.8	2018-06-19 18:08:09 UTC (rev 11095)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -29,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/quotacheck/quotacheck.8 233648 2012-03-29 05:02:12Z eadler $
 .\"
 .Dd January 25, 2007
 .Dt QUOTACHECK 8


Property changes on: trunk/sbin/quotacheck/quotacheck.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/quotacheck/quotacheck.c
===================================================================
--- trunk/sbin/quotacheck/quotacheck.c	2018-06-19 18:07:45 UTC (rev 11094)
+++ trunk/sbin/quotacheck/quotacheck.c	2018-06-19 18:08:09 UTC (rev 11095)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +43,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/quotacheck/quotacheck.c 241013 2012-09-27 23:31:06Z mdf $");
 
 /*
  * Fix up / report on disk quotas & usage
@@ -63,6 +64,7 @@
 #include <grp.h>
 #include <libutil.h>
 #include <pwd.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -383,9 +385,9 @@
 				if (vflag) {
 					if (aflag)
 						(void)printf("%s: ", mntpt);
-			(void)printf("out of range UID/GID (%u/%u) ino=%u\n",
+			(void)printf("out of range UID/GID (%u/%u) ino=%ju\n",
 					    DIP(dp, di_uid), DIP(dp,di_gid),
-					    ino);
+					    (uintmax_t)ino);
 				}
 				continue;
 			}
@@ -601,7 +603,8 @@
 	static caddr_t nextinop;
 
 	if (inumber != nextino++ || inumber > lastvalidinum)
-		errx(1, "bad inode number %d to nextinode", inumber);
+		errx(1, "bad inode number %ju to nextinode",
+		    (uintmax_t)inumber);
 	if (inumber >= lastinum) {
 		readcnt++;
 		dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));
@@ -635,7 +638,7 @@
 {
 
 	if (inum % sblock.fs_ipg != 0)
-		errx(1, "bad inode number %d to setinodebuf", inum);
+		errx(1, "bad inode number %ju to setinodebuf", (uintmax_t)inum);
 	lastvalidinum = inum + sblock.fs_ipg - 1;
 	nextino = inum;
 	lastinum = inum;

Modified: trunk/sbin/quotacheck/quotacheck.h
===================================================================
--- trunk/sbin/quotacheck/quotacheck.h	2018-06-19 18:07:45 UTC (rev 11094)
+++ trunk/sbin/quotacheck/quotacheck.h	2018-06-19 18:08:09 UTC (rev 11095)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -29,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/quotacheck/quotacheck.h 207736 2010-05-07 00:41:12Z mckusick $
  */
 
 extern char *blockcheck(char *);