file reorg, pathnames.h, paths.h

[unix-history] / usr / src / bin / ls / ls.c

diff --git a/usr/src/bin/ls/ls.c b/usr/src/bin/ls/ls.c
index 47e3e9e..73d82fc 100644 (file)
--- a/usr/src/bin/ls/ls.c
+++ b/usr/src/bin/ls/ls.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)ls.c       5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)ls.c       5.11 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -69,7 +69,7 @@ char  *getname(), *getgroup();
 
 char   *ctime();
 char   *malloc(), *calloc(), *realloc();
 
 char   *ctime();
 char   *malloc(), *calloc(), *realloc();

-char   *sprintf(), *strcpy(), *strcat();
+char   *strcpy(), *strcat();

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;


@@ -156,6 +156,8 @@ main(argc, argv)
                exit(1);
        }
        fp0 = fp;
                exit(1);
        }
        fp0 = fp;

+       setpassent(1);
+       setgroupent(1);

        for (i = 0; i < argc; i++) {
                if (gstat(fp, *argv, 1, (int *)0)) {
                        fp->fname = *argv;
        for (i = 0; i < argc; i++) {
                if (gstat(fp, *argv, 1, (int *)0)) {
                        fp->fname = *argv;


@@ -627,7 +629,6 @@ char *
 getname(uid)
        uid_t uid;
 {
 getname(uid)
        uid_t uid;
 {

-       extern int _pw_stayopen;

        static struct ncache {
                uid_t   uid;
                char    name[NMAX+1];
        static struct ncache {
                uid_t   uid;
                char    name[NMAX+1];


@@ -635,7 +636,6 @@ getname(uid)
        register struct passwd *pw;
        register struct ncache *cp;
 
        register struct passwd *pw;
        register struct ncache *cp;
 

-       _pw_stayopen = 1;

        cp = c_uid + (uid & CAMASK);
        if (cp->uid == uid && *cp->name)
                return(cp->name);
        cp = c_uid + (uid & CAMASK);
        if (cp->uid == uid && *cp->name)
                return(cp->name);