BSD 4_4 release

[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 b91d0b7..a577edc 100644 (file)
--- a/usr/src/usr.bin/wall/wall.c
+++ b/usr/src/usr.bin/wall/wall.c
@@ -1,28 +1,44 @@
 /*
 /*

- * Copyright (c) 1988, 1990 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1990, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

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

-static char sccsid[] = "@(#)wall.c     5.12 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)wall.c     8.1 (Berkeley) 6/6/93";

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


@@ -37,6 +53,7 @@ static char sccsid[] = "@(#)wall.c    5.12 (Berkeley) 6/29/90";
 #include <utmp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <utmp.h>
 #include <pwd.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <paths.h>
 
 #define        IGNOREUSER      "sleeper"
 #include <paths.h>
 
 #define        IGNOREUSER      "sleeper"


@@ -88,7 +105,7 @@ usage:
                if (!utmp.ut_name[0] ||
                    !strncmp(utmp.ut_name, IGNOREUSER, sizeof(utmp.ut_name)))
                        continue;
                if (!utmp.ut_name[0] ||
                    !strncmp(utmp.ut_name, IGNOREUSER, sizeof(utmp.ut_name)))
                        continue;

-               if (p = ttymsg(&iov, 1, utmp.ut_line))
+               if (p = ttymsg(&iov, 1, utmp.ut_line, 60*5))

                        (void)fprintf(stderr, "wall: %s\n", p);
        }
        exit(0);
                        (void)fprintf(stderr, "wall: %s\n", p);
        }
        exit(0);


@@ -99,13 +116,13 @@ makemsg(fname)
 {
        register int ch, cnt;
        struct tm *lt;
 {
        register int ch, cnt;
        struct tm *lt;

-       struct passwd *pw, *getpwuid();
+       struct passwd *pw;

        struct stat sbuf;
        time_t now, time();
        FILE *fp;
        int fd;
        char *p, *whom, hostname[MAXHOSTNAMELEN], lbuf[100], tmpname[15];
        struct stat sbuf;
        time_t now, time();
        FILE *fp;
        int fd;
        char *p, *whom, hostname[MAXHOSTNAMELEN], lbuf[100], tmpname[15];

-       char *getlogin(), *malloc(), *strcpy(), *ttyname();
+       char *getlogin(), *strcpy(), *ttyname();

 
        (void)strcpy(tmpname, _PATH_TMP);
        (void)strcat(tmpname, "/wall.XXXXXX");
 
        (void)strcpy(tmpname, _PATH_TMP);
        (void)strcat(tmpname, "/wall.XXXXXX");


@@ -139,7 +156,7 @@ makemsg(fname)
        }
        (void)fprintf(fp, "%79s\r\n", " ");
 
        }
        (void)fprintf(fp, "%79s\r\n", " ");
 

-       if (*fname && !(freopen(fname, "r", stdin))) {
+       if (fname && !(freopen(fname, "r", stdin))) {

                (void)fprintf(stderr, "wall: can't read %s.\n", fname);
                exit(1);
        }
                (void)fprintf(stderr, "wall: can't read %s.\n", fname);
                exit(1);
        }