=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/quota/quota.c,v retrieving revision 1.22 retrieving revision 1.23 diff -c -r1.22 -r1.23 *** src/usr.bin/quota/quota.c 2003/06/03 02:56:14 1.22 --- src/usr.bin/quota/quota.c 2003/06/10 22:20:49 1.23 *************** *** 1,4 **** ! /* $OpenBSD: quota.c,v 1.22 2003/06/03 02:56:14 millert Exp $ */ /* * Copyright (c) 1980, 1990, 1993 --- 1,4 ---- ! /* $OpenBSD: quota.c,v 1.23 2003/06/10 22:20:49 deraadt Exp $ */ /* * Copyright (c) 1980, 1990, 1993 *************** *** 41,47 **** #ifndef lint /*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/ static const char rcsid[] = ! "$OpenBSD: quota.c,v 1.22 2003/06/03 02:56:14 millert Exp $"; #endif /* not lint */ /* --- 41,47 ---- #ifndef lint /*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/ static const char rcsid[] = ! "$OpenBSD: quota.c,v 1.23 2003/06/10 22:20:49 deraadt Exp $"; #endif /* not lint */ /* *************** *** 105,113 **** int vflag; int ! main(argc, argv) ! int argc; ! char *argv[]; { int ngroups; gid_t mygid, gidset[NGROUPS]; --- 105,111 ---- int vflag; int ! main(int argc, char *argv[]) { int ngroups; gid_t mygid, gidset[NGROUPS]; *************** *** 179,185 **** } void ! usage() { fprintf(stderr, "%s\n%s\n%s\n", --- 177,183 ---- } void ! usage(void) { fprintf(stderr, "%s\n%s\n%s\n", *************** *** 193,200 **** * Print out quotas for a specified user identifier. */ void ! showuid(uid) ! uid_t uid; { struct passwd *pwd = getpwuid(uid); uid_t myuid; --- 191,197 ---- * Print out quotas for a specified user identifier. */ void ! showuid(uid_t uid) { struct passwd *pwd = getpwuid(uid); uid_t myuid; *************** *** 216,223 **** * Print out quotas for a specified user name. */ void ! showusrname(name) ! const char *name; { struct passwd *pwd = getpwnam(name); uid_t myuid; --- 213,219 ---- * Print out quotas for a specified user name. */ void ! showusrname(const char *name) { struct passwd *pwd = getpwnam(name); uid_t myuid; *************** *** 239,246 **** * Print out quotas for a specified group identifier. */ void ! showgid(gid) ! gid_t gid; { struct group *grp = getgrgid(gid); int ngroups; --- 235,241 ---- * Print out quotas for a specified group identifier. */ void ! showgid(gid_t gid) { struct group *grp = getgrgid(gid); int ngroups; *************** *** 274,281 **** * Print out quotas for a specified group name. */ void ! showgrpname(name) ! const char *name; { struct group *grp = getgrnam(name); int ngroups; --- 269,275 ---- * Print out quotas for a specified group name. */ void ! showgrpname(const char *name) { struct group *grp = getgrnam(name); int ngroups; *************** *** 306,315 **** } void ! showquotas(type, id, name) ! int type; ! u_long id; ! const char *name; { struct quotause *qup; struct quotause *quplist; --- 300,306 ---- } void ! showquotas(int type, u_long id, const char *name) { struct quotause *qup; struct quotause *quplist; *************** *** 396,405 **** } void ! heading(type, id, name, tag) ! int type; ! u_long id; ! const char *name, *tag; { printf("Disk quotas for %s %s (%cid %ld): %s\n", qfextension[type], --- 387,393 ---- } void ! heading(int type, u_long id, const char *name, const char *tag) { printf("Disk quotas for %s %s (%cid %ld): %s\n", qfextension[type], *************** *** 422,429 **** * Calculate the grace period and return a printable string for it. */ char * ! timeprt(seconds) ! time_t seconds; { time_t hours, minutes; static char buf[20]; --- 410,416 ---- * Calculate the grace period and return a printable string for it. */ char * ! timeprt(time_t seconds) { time_t hours, minutes; static char buf[20]; *************** *** 454,462 **** * Collect the requested quota information. */ struct quotause * ! getprivs(id, quotatype) ! long id; ! int quotatype; { struct quotause *qup, *quptail; struct fstab *fs; --- 441,447 ---- * Collect the requested quota information. */ struct quotause * ! getprivs(long id, int quotatype) { struct quotause *qup, *quptail; struct fstab *fs; *************** *** 516,525 **** * Check to see if a particular quota is to be enabled. */ int ! ufshasquota(fs, type, qfnamep) ! struct fstab *fs; ! int type; ! char **qfnamep; { static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; --- 501,507 ---- * Check to see if a particular quota is to be enabled. */ int ! ufshasquota(struct fstab *fs, int type, char **qfnamep) { static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; *************** *** 556,567 **** } int ! getufsquota(fst, fs, qup, id, quotatype) ! struct statfs *fst; ! struct fstab *fs; ! struct quotause *qup; ! long id; ! int quotatype; { char *qfpathname; int fd, qcmd; --- 538,545 ---- } int ! getufsquota(struct statfs *fst, struct fstab *fs, struct quotause *qup, ! long id, int quotatype) { char *qfpathname; int fd, qcmd; *************** *** 597,608 **** } int ! getnfsquota(fst, fs, qup, id, quotatype) ! struct statfs *fst; ! struct fstab *fs; ! struct quotause *qup; ! long id; ! int quotatype; { struct getquota_args gq_args; struct getquota_rslt gq_rslt; --- 575,582 ---- } int ! getnfsquota(struct statfs *fst, struct fstab *fs, struct quotause *qup, ! long id, int quotatype) { struct getquota_args gq_args; struct getquota_rslt gq_rslt; *************** *** 684,696 **** } int ! callaurpc(host, prognum, versnum, procnum, inproc, in, outproc, out) ! char *host; ! int prognum, versnum, procnum; ! xdrproc_t inproc; ! void *in; ! xdrproc_t outproc; ! void *out; { struct sockaddr_in server_addr; enum clnt_stat clnt_stat; --- 658,665 ---- } int ! callaurpc(char *host, int prognum, int versnum, int procnum, ! xdrproc_t inproc, void *in, xdrproc_t outproc, void *out) { struct sockaddr_in server_addr; enum clnt_stat clnt_stat; *************** *** 724,731 **** } int ! alldigits(s) ! char *s; { int c; --- 693,699 ---- } int ! alldigits(char *s) { int c;