386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/whois/whois.c b/usr/src/usr.bin/whois/whois.c
index 8ab2b24..358c293 100644 (file)
--- a/usr/src/usr.bin/whois/whois.c
+++ b/usr/src/usr.bin/whois/whois.c
@@ -2,7 +2,33 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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


@@ -12,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)whois.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)whois.c    5.11 (Berkeley) 3/2/91";

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


@@ -63,24 +89,24 @@ main(argc, argv)
        s = socket(hp->h_addrtype, SOCK_STREAM, 0);
        if (s < 0) {
                perror("whois: socket");
        s = socket(hp->h_addrtype, SOCK_STREAM, 0);
        if (s < 0) {
                perror("whois: socket");

-               exit(2);
+               exit(1);

        }
        bzero((caddr_t)&sin, sizeof (sin));
        sin.sin_family = hp->h_addrtype;
        if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
                perror("whois: bind");
        }
        bzero((caddr_t)&sin, sizeof (sin));
        sin.sin_family = hp->h_addrtype;
        if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
                perror("whois: bind");

-               exit(3);
+               exit(1);

        }
        bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
        sp = getservbyname("whois", "tcp");
        if (sp == NULL) {
                (void)fprintf(stderr, "whois: whois/tcp: unknown service\n");
        }
        bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
        sp = getservbyname("whois", "tcp");
        if (sp == NULL) {
                (void)fprintf(stderr, "whois: whois/tcp: unknown service\n");

-               exit(4);
+               exit(1);

        }
        sin.sin_port = sp->s_port;
        }
        sin.sin_port = sp->s_port;

-       if (connect(s, &sin, sizeof(sin)) < 0) {
+       if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {

                perror("whois: connect");
                perror("whois: connect");

-               exit(5);
+               exit(1);

        }
        sfi = fdopen(s, "r");
        sfo = fdopen(s, "w");
        }
        sfi = fdopen(s, "r");
        sfo = fdopen(s, "w");