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 bc264c0..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.7 (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;


@@ -582,13 +584,13 @@ fmtlstuff(p)
 
 int    m1[] = { 1, S_IREAD>>0, 'r', '-' };
 int    m2[] = { 1, S_IWRITE>>0, 'w', '-' };
 
 int    m1[] = { 1, S_IREAD>>0, 'r', '-' };
 int    m2[] = { 1, S_IWRITE>>0, 'w', '-' };

-int    m3[] = { 2, S_ISUID, 's', S_IEXEC>>0, 'x', '-' };
+int    m3[] = { 3, S_ISUID|(S_IEXEC>>0), 's', S_ISUID, 'S', S_IEXEC>>0, 'x', '-' };

 int    m4[] = { 1, S_IREAD>>3, 'r', '-' };
 int    m5[] = { 1, S_IWRITE>>3, 'w', '-' };
 int    m4[] = { 1, S_IREAD>>3, 'r', '-' };
 int    m5[] = { 1, S_IWRITE>>3, 'w', '-' };

-int    m6[] = { 2, S_ISGID, 's', S_IEXEC>>3, 'x', '-' };
+int    m6[] = { 3, S_ISGID|(S_IEXEC>>3), 's', S_ISGID, 'S', S_IEXEC>>3, 'x', '-' };

 int    m7[] = { 1, S_IREAD>>6, 'r', '-' };
 int    m8[] = { 1, S_IWRITE>>6, 'w', '-' };
 int    m7[] = { 1, S_IREAD>>6, 'r', '-' };
 int    m8[] = { 1, S_IWRITE>>6, 'w', '-' };

-int    m9[] = { 2, S_ISVTX, 't', S_IEXEC>>6, 'x', '-' };
+int    m9[] = { 3, S_ISVTX|(S_IEXEC>>6), 't', S_ISVTX, 'T', S_IEXEC>>6, 'x', '-' };

 
 int    *m[] = { m1, m2, m3, m4, m5, m6, m7, m8, m9};
 
 
 int    *m[] = { m1, m2, m3, m4, m5, m6, m7, m8, m9};
 


@@ -603,9 +605,9 @@ fmtmode(lp, flags)
                register int *pairp = *mp++;
                register int n = *pairp++;
 
                register int *pairp = *mp++;
                register int n = *pairp++;
 

-               while (--n >= 0 && (flags&*pairp++) == 0)
-                       pairp++;
-               *lp++ = *pairp;
+               while (--n >= 0 && (flags&*pairp) != *pairp)
+                       pairp += 2;
+               *lp++ = pairp[n>=0];

        }
        return (lp);
 }
        }
        return (lp);
 }


@@ -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);