[Midnightbsd-cvs] src [10796] trunk/usr.sbin/edquota: sync

[laffer1 at midnightbsd.org]

Revision: 10796
          http://svnweb.midnightbsd.org/src/?rev=10796
Author:   laffer1
Date:     2018-06-09 23:03:34 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/edquota/Makefile
    trunk/usr.sbin/edquota/edquota.c

Modified: trunk/usr.sbin/edquota/Makefile
===================================================================
--- trunk/usr.sbin/edquota/Makefile	2018-06-10 03:00:33 UTC (rev 10795)
+++ trunk/usr.sbin/edquota/Makefile	2018-06-10 03:03:34 UTC (rev 10796)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/edquota/Makefile 207736 2010-05-07 00:41:12Z mckusick $
 
 PROG=	edquota
 MAN=	edquota.8

Modified: trunk/usr.sbin/edquota/edquota.c
===================================================================
--- trunk/usr.sbin/edquota/edquota.c	2018-06-10 03:00:33 UTC (rev 10795)
+++ trunk/usr.sbin/edquota/edquota.c	2018-06-10 03:03:34 UTC (rev 10796)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -43,14 +44,12 @@
 #endif
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/edquota/edquota.c 300270 2016-05-20 06:27:58Z truckman $");
 
 /*
  * Disk quota editor.
  */
 
-#include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
@@ -392,7 +391,7 @@
 		if ((qup = (struct quotause *)calloc(1, sizeof(*qup))) == NULL)
 			errx(2, "out of memory");
 		qup->qf = qf;
-		strncpy(qup->fsname, fs->fs_file, sizeof(qup->fsname));
+		strlcpy(qup->fsname, fs->fs_file, sizeof(qup->fsname));
 		if (quota_read(qf, &qup->dqblk, id) == -1) {
 			warn("cannot read quotas on %s", fs->fs_file);
 			freeprivs(qup);
@@ -426,7 +425,7 @@
 }
 
 /*
- * Take a list of priviledges and get it edited.
+ * Take a list of privileges and get it edited.
  */
 int
 editit(char *tmpf)