file reorg, pathnames.h

[unix-history] / usr / src / usr.sbin / quot / quot.c

diff --git a/usr/src/usr.sbin/quot/quot.c b/usr/src/usr.sbin/quot/quot.c
index 6957281..c172e77 100644 (file)
--- a/usr/src/usr.sbin/quot/quot.c
+++ b/usr/src/usr.sbin/quot/quot.c
@@ -1,17 +1,18 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)quot.c      4.14 (Berkeley) 88/04/18";
+static char *sccsid = "@(#)quot.c      4.16 (Berkeley) 89/05/15";

 #endif
 
 /*
  * quot
  */
 
 #endif
 
 /*
  * quot
  */
 

-#include <stdio.h>
-#include <ctype.h>

 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>
 #include <sys/file.h>

+#include <stdio.h>
+#include <ctype.h>
+#include <paths.h>

 
 #define        ISIZ    (MAXBSIZE/sizeof(struct dinode))
 union {
 
 #define        ISIZ    (MAXBSIZE/sizeof(struct dinode))
 union {


@@ -82,6 +83,7 @@ main(argc, argv)
        argv += optind;
 
        (void)time(&now);
        argv += optind;
 
        (void)time(&now);

+       setpassent(1);

        if (argc)
                for (; *argv; ++argv) {
                        if (check(*argv, (char *)NULL) == 0)
        if (argc)
                for (; *argv; ++argv) {
                        if (check(*argv, (char *)NULL) == 0)


@@ -109,7 +111,7 @@ quotall()
                cp = rindex(fs->fs_spec, '/');
                if (cp == 0)
                        continue;
                cp = rindex(fs->fs_spec, '/');
                if (cp == 0)
                        continue;

-               (void)sprintf(dev, "/dev/r%s", cp + 1);
+               (void)sprintf(dev, "%s/r%s", _PATH_DEV, cp + 1);

                if (check(dev, fs->fs_file) == 0)
                        report();
        }
                if (check(dev, fs->fs_file) == 0)
                        report();
        }


@@ -357,10 +359,8 @@ getname(uid)
 {
        register struct passwd *pw;
        struct passwd *getpwent();
 {
        register struct passwd *pw;
        struct passwd *getpwent();

-       extern int _pw_stayopen;

        register int cp;
 
        register int cp;
 

-       _pw_stayopen = 1;

        cp = uid & UIDMASK;
        if (uid >= 0 && nc[cp].uid == uid && nc[cp].name[0])
                return (nc[cp].name);
        cp = uid & UIDMASK;
        if (uid >= 0 && nc[cp].uid == uid && nc[cp].name[0])
                return (nc[cp].name);