BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/talk/get_names.c b/usr/src/usr.bin/talk/get_names.c
index 840f304..0af26b1 100644 (file)
--- a/usr/src/usr.bin/talk/get_names.c
+++ b/usr/src/usr.bin/talk/get_names.c
@@ -2,29 +2,44 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 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[] = "@(#)get_names.c        5.8 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)get_names.c        5.9 (Berkeley) 3/1/91";

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

-#include "talk.h"

 #include <sys/param.h>
 #include <sys/param.h>

+#include <sys/socket.h>

 #include <protocols/talkd.h>
 #include <pwd.h>
 #include <protocols/talkd.h>
 #include <pwd.h>

+#include "talk.h"

 
 char   *getlogin();
 char   *ttyname();
 
 char   *getlogin();
 char   *ttyname();


@@ -64,7 +79,7 @@ get_names(argc, argv)
        gethostname(hostname, sizeof (hostname));
        my_machine_name = hostname;
        /* check for, and strip out, the machine name of the target */
        gethostname(hostname, sizeof (hostname));
        my_machine_name = hostname;
        /* check for, and strip out, the machine name of the target */

-       for (cp = argv[1]; *cp && !any(*cp, "@:!."); cp++)
+       for (cp = argv[1]; *cp && !index("@:!.", *cp); cp++)

                ;
        if (*cp == '\0') {
                /* this is a local to local talk */
                ;
        if (*cp == '\0') {
                /* this is a local to local talk */


@@ -101,14 +116,3 @@ get_names(argc, argv)
        strncpy(msg.r_tty, his_tty, TTY_SIZE);
        msg.r_tty[TTY_SIZE - 1] = '\0';
 }
        strncpy(msg.r_tty, his_tty, TTY_SIZE);
        msg.r_tty[TTY_SIZE - 1] = '\0';
 }

-
-static
-any(c, cp)
-       register char c, *cp;
-{
-
-       while (*cp)
-               if (c == *cp++)
-                       return (1);
-       return (0);
-}