From e7d0804666a37dfc6f4cdf20a24624f300e5bf9e Mon Sep 17 00:00:00 2001 From: charnier Date: Mon, 4 Aug 1997 06:45:11 +0000 Subject: Use err(3). Cosmetic in usage string. Typo in man page. --- usr.bin/quota/quota.1 | 8 +++--- usr.bin/quota/quota.c | 72 ++++++++++++++++++++++----------------------------- 2 files changed, 35 insertions(+), 45 deletions(-) (limited to 'usr.bin/quota') diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1 index b82cced..c9bdb10 100644 --- a/usr.bin/quota/quota.1 +++ b/usr.bin/quota/quota.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)quota.1 8.1 (Berkeley) 6/6/93 -.\" $Id$ +.\" $Id: quota.1,v 1.5 1997/02/22 19:56:38 peter Exp $ .\" .Dd June 6, 1993 .Dt QUOTA 1 @@ -69,7 +69,7 @@ The optional .Fl u flag is equivalent to the default. .It Fl v -.Nm quota +.Nm Quota will display quotas on filesystems where no storage is allocated. .It Fl q @@ -116,7 +116,7 @@ For filesystems, quotas must be turned on in .Pa /etc/fstab . If -.Nm quota +.Nm exits with a non-zero status, one or more filesystems are over quota. .Sh FILES @@ -130,7 +130,7 @@ to find filesystem names and locations .El .Sh HISTORY The -.Nm quota +.Nm command appeared in .Bx 4.2 . .Sh SEE ALSO diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c index 77a165c..a761cee 100644 --- a/usr.bin/quota/quota.c +++ b/usr.bin/quota/quota.c @@ -35,13 +35,17 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint +#if 0 static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ /* @@ -54,14 +58,14 @@ static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93"; #include #include #include +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include #include #include @@ -113,8 +117,6 @@ main(argc, argv) gid_t mygid, gidset[NGROUPS]; int i, gflag = 0, uflag = 0; char ch; - extern char *optarg; - extern int optind, errno; while ((ch = getopt(argc, argv, "ugvq")) != -1) { switch(ch) { @@ -144,10 +146,8 @@ main(argc, argv) if (gflag) { mygid = getgid(); ngroups = getgroups(NGROUPS, gidset); - if (ngroups < 0) { - perror("quota: getgroups"); - return(1); - } + if (ngroups < 0) + err(1, "getgroups"); showgid(mygid); for (i = 0; i < ngroups; i++) if (gidset[i] != mygid) @@ -182,9 +182,9 @@ usage() { fprintf(stderr, "%s\n%s\n%s\n", - "Usage: quota [-guqv]", - "\tquota [-qv] -u username ...", - "\tquota [-qv] -g groupname ..."); + "usage: quota [-guqv]", + " quota [-qv] -u username ...", + " quota [-qv] -g groupname ..."); exit(1); } @@ -222,13 +222,12 @@ showusrname(name) u_long myuid; if (pwd == NULL) { - fprintf(stderr, "quota: %s: unknown user\n", name); + warnx("%s: unknown user", name); return; } myuid = getuid(); if (pwd->pw_uid != myuid && myuid != 0) { - fprintf(stderr, "quota: %s (uid %u): permission denied\n", - name, pwd->pw_uid); + warnx("%s (uid %u): permission denied", name, pwd->pw_uid); return; } showquotas(USRQUOTA, pwd->pw_uid, name); @@ -254,7 +253,7 @@ showgid(gid) mygid = getgid(); ngroups = getgroups(NGROUPS, gidset); if (ngroups < 0) { - perror("quota: getgroups"); + warn("getgroups"); return; } if (gid != mygid) { @@ -262,9 +261,7 @@ showgid(gid) if (gid == gidset[i]) break; if (i >= ngroups && getuid() != 0) { - fprintf(stderr, - "quota: %s (gid %lu): permission denied\n", - name, gid); + warnx("%s (gid %lu): permission denied", name, gid); return; } } @@ -284,13 +281,13 @@ showgrpname(name) register int i; if (grp == NULL) { - fprintf(stderr, "quota: %s: unknown group\n", name); + warnx("%s: unknown group", name); return; } mygid = getgid(); ngroups = getgroups(NGROUPS, gidset); if (ngroups < 0) { - perror("quota: getgroups"); + warn("getgroups"); return; } if (grp->gr_gid != mygid) { @@ -298,9 +295,7 @@ showgrpname(name) if (grp->gr_gid == gidset[i]) break; if (i >= ngroups && getuid() != 0) { - fprintf(stderr, - "quota: %s (gid %u): permission denied\n", - name, grp->gr_gid); + warnx("%s (gid %u): permission denied", name, grp->gr_gid); return; } } @@ -466,18 +461,14 @@ getprivs(id, quotatype) qup = quphead = (struct quotause *)0; nfst = getmntinfo(&fst, MNT_WAIT); - if (nfst == 0) { - fprintf(stderr, "quota: no filesystems mounted!\n"); - exit(2); - } + if (nfst == 0) + errx(2, "no filesystems mounted!"); setfsent(); for (i=0; ifs_file, qcmd, id, (char *)&qup->dqblk) != 0) { if ((fd = open(qfpathname, O_RDONLY)) < 0) { - perror(qfpathname); + warn(qfpathname); return (0); } (void) lseek(fd, (off_t)(id * sizeof(struct dqblk)), L_SET); @@ -583,8 +574,7 @@ getufsquota(fst, fs, qup, id, quotatype) case sizeof(struct dqblk): /* OK */ break; default: /* ERROR */ - fprintf(stderr, "quota: read error"); - perror(qfpathname); + warn("read error: %s", qfpathname); close(fd); return (0); } @@ -621,7 +611,7 @@ getnfsquota(fst, fs, qup, id, quotatype) */ cp = strchr(fst->f_mntfromname, ':'); if (cp == NULL) { - fprintf(stderr, "cannot find hostname for %s\n", + warnx("cannot find hostname for %s", fst->f_mntfromname); return (0); } @@ -645,7 +635,7 @@ getnfsquota(fst, fs, qup, id, quotatype) case Q_NOQUOTA: break; case Q_EPERM: - fprintf(stderr, "quota permission error, host: %s\n", + warnx("quota permission error, host: %s", fst->f_mntfromname); break; case Q_OK: @@ -675,7 +665,7 @@ getnfsquota(fst, fs, qup, id, quotatype) *cp = ':'; return (1); default: - fprintf(stderr, "bad rpc result, host: %s\n", + warnx("bad rpc result, host: %s", fst->f_mntfromname); break; } -- cgit v1.1