summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-01-07 05:28:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-01-07 05:28:07 +0000
commit1ec9ac839c29d0c6d5074874a3da9edc709256cd (patch)
tree5225ea94feae058b6ff9063a33db248aff473ee9 /usr.sbin
parent01b9b71d86a5edcc543a88b2d407927fa52c042d (diff)
accept either ffs or ufs for filesystem name
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/edquota/edquota.c5
-rw-r--r--usr.sbin/quotaon/quotaon.c8
-rw-r--r--usr.sbin/repquota/repquota.c5
3 files changed, 11 insertions, 7 deletions
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 93244a2982f..cbd802895f2 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.3 1995/11/06 21:40:46 deraadt Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.4 1996/01/07 05:28:04 deraadt Exp $";
#endif /* not lint */
/*
@@ -221,7 +221,8 @@ getprivs(id, quotatype)
quphead = (struct quotause *)0;
qcmd = QCMD(Q_GETQUOTA, quotatype);
while (fs = getfsent()) {
- if (strcmp(fs->fs_vfstype, "ffs"))
+ if (strcmp(fs->fs_vfstype, "ffs") &&
+ strcmp(fs->fs_vfstype, "ufs"))
continue;
if (!hasquota(fs, quotatype, &qfpathname))
continue;
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 2ab0a7b0723..c3267a989a9 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.3 1995/11/06 21:40:57 deraadt Exp $";
+static char *rcsid = "$Id: quotaon.c,v 1.4 1996/01/07 05:28:05 deraadt Exp $";
#endif /* not lint */
/*
@@ -113,8 +113,10 @@ main(argc, argv)
}
setfsent();
while ((fs = getfsent()) != NULL) {
- if (strcmp(fs->fs_vfstype, "ffs") ||
- strcmp(fs->fs_type, FSTAB_RW))
+ if (strcmp(fs->fs_type, FSTAB_RW))
+ continue;
+ if (strcmp(fs->fs_vfstype, "ffs") &&
+ strcmp(fs->fs_vfstype, "ufs"))
continue;
if (aflag) {
if (gflag && hasquota(fs, GRPQUOTA, &qfnp))
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 21ef7a1f31a..0715aae99a3 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.3 1995/11/06 21:41:00 deraadt Exp $";
+static char *rcsid = "$Id: repquota.c,v 1.4 1996/01/07 05:28:06 deraadt Exp $";
#endif /* not lint */
/*
@@ -131,7 +131,8 @@ main(argc, argv)
}
setfsent();
while ((fs = getfsent()) != NULL) {
- if (strcmp(fs->fs_vfstype, "ffs"))
+ if (strcmp(fs->fs_vfstype, "ffs") &&
+ strcmp(fs->fs_vfstype, "ufs"))
continue;
if (aflag) {
if (gflag && hasquota(fs, GRPQUOTA, &qfnp))