BSD 4_4 release

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

diff --git a/usr/src/usr.bin/write/write.c b/usr/src/usr.bin/write/write.c
index 14cc5bf..7d99f21 100644 (file)
--- a/usr/src/usr.bin/write/write.c
+++ b/usr/src/usr.bin/write/write.c
@@ -1,31 +1,47 @@
 /*
 /*

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

  *
  * This code is derived from software contributed to Berkeley by
  * Jef Poskanzer and Craig Leres of the Lawrence Berkeley Laboratory.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Jef Poskanzer and Craig Leres of the Lawrence Berkeley Laboratory.
  *

- * 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 MERCHANTABILITY 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) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 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[] = "@(#)write.c    4.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)write.c    8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -35,10 +51,9 @@ static char sccsid[] = "@(#)write.c  4.17 (Berkeley) %G%";
 #include <sys/time.h>
 #include <utmp.h>
 #include <ctype.h>
 #include <sys/time.h>
 #include <utmp.h>
 #include <ctype.h>

-#include <paths.h>

 #include <pwd.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <stdio.h>

-#include <strings.h>
+#include <string.h>

 
 extern int errno;
 
 
 extern int errno;
 


@@ -50,7 +65,7 @@ main(argc, argv)
        time_t atime;
        uid_t myuid;
        int msgsok, myttyfd;
        time_t atime;
        uid_t myuid;
        int msgsok, myttyfd;

-       char tty[MAXPATHLEN], *mytty, *getlogin(), *ttyname();
+       char tty[MAXPATHLEN], *mytty, *ttyname();

        void done();
 
        /* check that sender has write enabled */
        void done();
 
        /* check that sender has write enabled */


@@ -239,13 +254,19 @@ do_write(tty, mytty, myuid)
        register char *login, *nows;
        register struct passwd *pwd;
        time_t now, time();
        register char *login, *nows;
        register struct passwd *pwd;
        time_t now, time();

-       char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
+       char *getlogin(), path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];

        void done();
 
        void done();
 

+       /* Determine our login name before the we reopen() stdout */
+       if ((login = getlogin()) == NULL)
+               if (pwd = getpwuid(myuid))
+                       login = pwd->pw_name;
+               else
+                       login = "???";
+

        (void)sprintf(path, "/dev/%s", tty);
        if ((freopen(path, "w", stdout)) == NULL) {
        (void)sprintf(path, "/dev/%s", tty);
        if ((freopen(path, "w", stdout)) == NULL) {

-               (void)fprintf(stderr,
-                   "write: %s: %s\n", path, strerror(errno));
+               (void)fprintf(stderr, "write: %s: %s\n", path, strerror(errno));

                exit(1);
        }
 
                exit(1);
        }
 


@@ -253,11 +274,6 @@ do_write(tty, mytty, myuid)
        (void)signal(SIGHUP, done);
 
        /* print greeting */
        (void)signal(SIGHUP, done);
 
        /* print greeting */

-       if ((login = getlogin()) == NULL)
-               if (pwd = getpwuid(myuid))
-                       login = pwd->pw_name;
-               else
-                       login = "???";

        if (gethostname(host, sizeof(host)) < 0)
                (void)strcpy(host, "???");
        now = time((time_t *)NULL);
        if (gethostname(host, sizeof(host)) < 0)
                (void)strcpy(host, "???");
        now = time((time_t *)NULL);