BSD 4_4_Lite2 release

[unix-history] / usr / src / old / talk / talk / talk.c

diff --git a/usr/src/old/talk/talk/talk.c b/usr/src/old/talk/talk/talk.c
index e2ce132..ef797ce 100644 (file)
--- a/usr/src/old/talk/talk/talk.c
+++ b/usr/src/old/talk/talk/talk.c
@@ -1,13 +1,40 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1983, 1985
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
+"@(#) Copyright (c) 1983, 1985\n\
+        Regents of the University of California.  All rights reserved.\n";

 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint


@@ -30,6 +57,7 @@ static char sccsid[] = "@(#)talk.c    5.1 (Berkeley) 6/6/85";
  *             Modified to run under 4.1c by Peter Moore 3/17/83
  */
 
  *             Modified to run under 4.1c by Peter Moore 3/17/83
  */
 

+int

 main(argc, argv)
        int argc;
        char *argv[];
 main(argc, argv)
        int argc;
        char *argv[];


@@ -40,9 +68,10 @@ main(argc, argv)
        open_ctl();
        open_sockt();
        start_msgs();
        open_ctl();
        open_sockt();
        start_msgs();

-       if (!check_local() )
+       if (!check_local())

                invite_remote();
        end_msgs();
        set_edit_chars();
        talk();
                invite_remote();
        end_msgs();
        set_edit_chars();
        talk();

+       return (0);

 }
 }