changed the way the INDEX operator is evaluated to better

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

diff --git a/usr/src/usr.bin/wall/wall.c b/usr/src/usr.bin/wall/wall.c
index 4a28f43..f528eb6 100644 (file)
--- a/usr/src/usr.bin/wall/wall.c
+++ b/usr/src/usr.bin/wall/wall.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)wall.c      4.4 (Berkeley) 81/05/06";
+static char *sccsid = "@(#)wall.c      4.6 (Berkeley) 82/03/15";

 /*
  * wall.c - Broadcast a message to all users.
  *
 /*
  * wall.c - Broadcast a message to all users.
  *


@@ -9,10 +9,11 @@ static char *sccsid = "@(#)wall.c     4.4 (Berkeley) 81/05/06";
 #include <stdio.h>
 #include <utmp.h>
 #include <time.h>
 #include <stdio.h>
 #include <utmp.h>
 #include <time.h>

-#include <whoami.h>

 #include <signal.h>
 #define        USERS   128
 #include <signal.h>
 #define        USERS   128

+#define IGNOREUSER     "sleeper"

 
 

+char   hostname[32];

 char   mesg[3000];
 int    msize,sline;
 struct utmp utmp[USERS];
 char   mesg[3000];
 int    msize,sline;
 struct utmp utmp[USERS];


@@ -32,6 +33,7 @@ char *argv[];
        FILE *f;
        FILE *mf;
 
        FILE *f;
        FILE *mf;
 

+       gethostname(hostname, sizeof (hostname));

        if((f = fopen("/etc/utmp", "r")) == NULL) {
                fprintf(stderr, "Cannot open /etc/utmp\n");
                exit(1);
        if((f = fopen("/etc/utmp", "r")) == NULL) {
                fprintf(stderr, "Cannot open /etc/utmp\n");
                exit(1);


@@ -61,11 +63,9 @@ char *argv[];
                strncpy(who, utmp[sline].ut_name, sizeof(utmp[sline].ut_name));
        for(i=0; i<USERS; i++) {
                p = &utmp[i];
                strncpy(who, utmp[sline].ut_name, sizeof(utmp[sline].ut_name));
        for(i=0; i<USERS; i++) {
                p = &utmp[i];

-               if(p->ut_name[0] == 0)
+               if ((p->ut_name[0] == 0) ||
+                   (strncmp (p->ut_name, IGNOREUSER, sizeof(p->ut_name)) == 0))

                        continue;
                        continue;

-       /***            this might be nice, but utmp gets so out of date !!
-               sleep(1);
-       ***/

                sendmes(p->ut_line);
        }
        exit(0);
                sendmes(p->ut_line);
        }
        exit(0);


@@ -80,13 +80,6 @@ char *tty;
        register int c, ch;
        FILE *f;
 
        register int c, ch;
        FILE *f;
 

-/***                   you can't do this with lots of users & MAXUPROC
-       i = fork();
-       if(i == -1) {
-               fprintf(stderr, "Try again\n");
-               return;
-       }
- ***/

        while ((i = fork()) == -1)
                if (wait((int *)0) == -1) {
                        fprintf(stderr, "Try again\n");
        while ((i = fork()) == -1)
                if (wait((int *)0) == -1) {
                        fprintf(stderr, "Try again\n");


@@ -107,7 +100,7 @@ char *tty;
        setbuf(f, buf);
        fprintf(f,
            "\n\a\a\aBroadcast Message from %s!%s (%.*s) at %d:%02d ...\r\n\n"
        setbuf(f, buf);
        fprintf(f,
            "\n\a\a\aBroadcast Message from %s!%s (%.*s) at %d:%02d ...\r\n\n"

-               , sysname
+               , hostname

                , who
                , sizeof(utmp[sline].ut_line)
                , utmp[sline].ut_line
                , who
                , sizeof(utmp[sline].ut_line)
                , utmp[sline].ut_line