BSD 4_3_Reno release

[unix-history] / usr / src / libexec / talkd / announce.c

diff --git a/usr/src/libexec/talkd/announce.c b/usr/src/libexec/talkd/announce.c
index bafbe23..5798ded 100644 (file)
--- a/usr/src/libexec/talkd/announce.c
+++ b/usr/src/libexec/talkd/announce.c
@@ -1,12 +1,25 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)announce.c 5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)announce.c 5.8 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -19,6 +32,7 @@ static char sccsid[] = "@(#)announce.c        5.3 (Berkeley) %G%";
 #include <syslog.h>
 
 #include <protocols/talkd.h>
 #include <syslog.h>
 
 #include <protocols/talkd.h>

+#include <paths.h>

 
 extern int errno;
 extern char hostname[];
 
 extern int errno;
 extern char hostname[];


@@ -72,7 +86,7 @@ announce_proc(request, remote_machine)
        FILE *tf;
        struct stat stbuf;
 
        FILE *tf;
        struct stat stbuf;
 

-       sprintf(full_tty, "/dev/%s", request->r_tty);
+       (void)sprintf(full_tty, "%s/%s", _PATH_DEV, request->r_tty);

        if (access(full_tty, 0) != 0)
                return (FAILED);
        if ((tf = fopen(full_tty, "w")) == NULL)
        if (access(full_tty, 0) != 0)
                return (FAILED);
        if ((tf = fopen(full_tty, "w")) == NULL)


@@ -121,26 +135,26 @@ print_mesg(tf, request, remote_machine)
        max_size = 0;
        gettimeofday(&clock, &zone);
        localclock = localtime( &clock.tv_sec );
        max_size = 0;
        gettimeofday(&clock, &zone);
        localclock = localtime( &clock.tv_sec );

-       sprintf(line_buf[i], " ");
+       (void)sprintf(line_buf[i], " ");

        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;

-       sprintf(line_buf[i], "Message from Talk_Daemon@%s at %d:%02d ...",
+       (void)sprintf(line_buf[i], "Message from Talk_Daemon@%s at %d:%02d ...",

        hostname, localclock->tm_hour , localclock->tm_min );
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;
        hostname, localclock->tm_hour , localclock->tm_min );
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;

-       sprintf(line_buf[i], "talk: connection requested by %s@%s.",
+       (void)sprintf(line_buf[i], "talk: connection requested by %s@%s.",

                request->l_name, remote_machine);
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;
                request->l_name, remote_machine);
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;

-       sprintf(line_buf[i], "talk: respond with:  talk %s@%s",
+       (void)sprintf(line_buf[i], "talk: respond with:  talk %s@%s",

                request->l_name, remote_machine);
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;
                request->l_name, remote_machine);
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;

-       sprintf(line_buf[i], " ");
+       (void)sprintf(line_buf[i], " ");

        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;
        sizes[i] = strlen(line_buf[i]);
        max_size = max(max_size, sizes[i]);
        i++;