BSD 4_4 release

[unix-history] / usr / src / usr.bin / talk / msgs.c

diff --git a/usr/src/usr.bin/talk/msgs.c b/usr/src/usr.bin/talk/msgs.c
index fd385ab..733c207 100644 (file)
--- a/usr/src/usr.bin/talk/msgs.c
+++ b/usr/src/usr.bin/talk/msgs.c
@@ -1,24 +1,38 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  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.
+ * 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

-static char sccsid[] = "@(#)msgs.c     5.5 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)msgs.c     8.1 (Berkeley) 6/6/93";

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


@@ -26,9 +40,9 @@ static char sccsid[] = "@(#)msgs.c    5.5 (Berkeley) 6/1/90";
  * if we are slow connecting.
  */
 
  * if we are slow connecting.
  */
 

+#include <sys/time.h>

 #include <signal.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdio.h>

-#include <sys/time.h>

 #include "talk.h"
 
 #define MSG_INTERVAL 4
 #include "talk.h"
 
 #define MSG_INTERVAL 4


@@ -36,9 +50,9 @@ static char sccsid[] = "@(#)msgs.c    5.5 (Berkeley) 6/1/90";
 char   *current_state;
 int    current_line = 0;
 
 char   *current_state;
 int    current_line = 0;
 

+void

 disp_msg()
 {
 disp_msg()
 {

-

        message(current_state);
 }
 
        message(current_state);
 }
 


@@ -50,7 +64,7 @@ start_msgs()
        signal(SIGALRM, disp_msg);
        itimer.it_value.tv_sec = itimer.it_interval.tv_sec = MSG_INTERVAL;
        itimer.it_value.tv_usec = itimer.it_interval.tv_usec = 0;
        signal(SIGALRM, disp_msg);
        itimer.it_value.tv_sec = itimer.it_interval.tv_sec = MSG_INTERVAL;
        itimer.it_value.tv_usec = itimer.it_interval.tv_usec = 0;

-       setitimer(ITIMER_REAL, &itimer, (struct timerval *)0);
+       setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);

 }
 
 end_msgs()
 }
 
 end_msgs()


@@ -59,6 +73,6 @@ end_msgs()
 
        timerclear(&itimer.it_value);
        timerclear(&itimer.it_interval);
 
        timerclear(&itimer.it_value);
        timerclear(&itimer.it_interval);

-       setitimer(ITIMER_REAL, &itimer, (struct timerval *)0);
+       setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);

        signal(SIGALRM, SIG_DFL);
 }
        signal(SIGALRM, SIG_DFL);
 }