fixes to name processing (8 char names and non-alnum names work) per z@cca

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

diff --git a/usr/src/usr.sbin/ac/ac.c b/usr/src/usr.sbin/ac/ac.c
index 145e095..808ad07 100644 (file)
--- a/usr/src/usr.sbin/ac/ac.c
+++ b/usr/src/usr.sbin/ac/ac.c
@@ -1,7 +1,7 @@
 /*
  * acct [ -w wtmp ] [ -d ] [ -p ] [ people ]
  */
 /*
  * acct [ -w wtmp ] [ -d ] [ -p ] [ people ]
  */

-static char *sccsid = "@(#)ac.c        4.1 (Berkeley) %G%";
+static char *sccsid = "@(#)ac.c        4.2 (Berkeley) %G%";

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


@@ -71,7 +71,7 @@ char **argv;
                fl = 0;
                for (i=0; i<NMAX; i++) {
                        c = ibuf.ut_name[i];
                fl = 0;
                for (i=0; i<NMAX; i++) {
                        c = ibuf.ut_name[i];

-                       if(isdigit(c) || isalpha(c)) {
+                       if (isprint(c) && c != ' ') {

                                if (fl)
                                        goto skip;
                                continue;
                                if (fl)
                                        goto skip;
                                continue;


@@ -215,7 +215,7 @@ among(i)
                p = pptr[j];
                for (k=0; k<NMAX; k++) {
                        if (*p == ubuf[i].uname[k]) {
                p = pptr[j];
                for (k=0; k<NMAX; k++) {
                        if (*p == ubuf[i].uname[k]) {

-                               if (*p++ == '\0')
+                               if (*p++ == '\0' || k == NMAX-1)

                                        return(1);
                        } else
                                break;
                                        return(1);
                        } else
                                break;