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 d75fe6e..358c293 100644 (file)
--- a/usr/src/usr.bin/whois/whois.c
+++ b/usr/src/usr.bin/whois/whois.c
@@ -2,12 +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.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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


@@ -17,35 +38,33 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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

-

 #include <netinet/in.h>
 #include <netinet/in.h>

-
-#include <stdio.h>

 #include <netdb.h>
 #include <netdb.h>

+#include <stdio.h>

 
 

-#define        NICHOST "sri-nic.arpa"
+#define        NICHOST "nic.ddn.mil"

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;

-       char *argv[];
+       char **argv;

 {
        extern char *optarg;
        extern int optind;
        register FILE *sfi, *sfo;
 {
        extern char *optarg;
        extern int optind;
        register FILE *sfi, *sfo;

-       register int c;
+       register int ch;

        struct sockaddr_in sin;
        struct hostent *hp;
        struct servent *sp;
        struct sockaddr_in sin;
        struct hostent *hp;
        struct servent *sp;

-       int ch, s;
+       int s;

        char *host;
 
        host = NICHOST;
        char *host;
 
        host = NICHOST;

-       while ((ch = getopt(argc, argv, "h")) != EOF)
+       while ((ch = getopt(argc, argv, "h:")) != EOF)

                switch((char)ch) {
                case 'h':
                        host = optarg;
                switch((char)ch) {
                case 'h':
                        host = optarg;


@@ -57,53 +76,56 @@ main(argc, argv)
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       if (argc != 1)
+       if (!argc)

                usage();
 
        hp = gethostbyname(host);
        if (hp == NULL) {
                usage();
 
        hp = gethostbyname(host);
        if (hp == NULL) {

-               fprintf(stderr, "whois: %s: host unknown\n", host);
+               (void)fprintf(stderr, "whois: %s: ", host);
+               herror((char *)NULL);

                exit(1);
        }
        host = hp->h_name;
                exit(1);
        }
        host = hp->h_name;

-       s = socket(hp->h_addrtype, SOCK_STREAM, 0, 0);
+       s = socket(hp->h_addrtype, SOCK_STREAM, 0);

        if (s < 0) {
                perror("whois: socket");
        if (s < 0) {
                perror("whois: socket");

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

        }
        bzero((caddr_t)&sin, sizeof (sin));
        sin.sin_family = hp->h_addrtype;
        }
        bzero((caddr_t)&sin, sizeof (sin));
        sin.sin_family = hp->h_addrtype;

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

                perror("whois: bind");
                perror("whois: bind");

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

        }
        }

-       bcopy(hp->h_addr, &sin.sin_addr, hp->h_length);
+       bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);

        sp = getservbyname("whois", "tcp");
        if (sp == NULL) {
        sp = getservbyname("whois", "tcp");
        if (sp == NULL) {

-               fprintf(stderr, "whois: whois/tcp: unknown service\n");
-               exit(4);
+               (void)fprintf(stderr, "whois: whois/tcp: unknown service\n");
+               exit(1);

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

-       if (connect(s, &sin, sizeof (sin), 0) < 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");
        if (sfi == NULL || sfo == NULL) {
        }
        sfi = fdopen(s, "r");
        sfo = fdopen(s, "w");
        if (sfi == NULL || sfo == NULL) {

-               perror("fdopen");
-               close(s);
+               perror("whois: fdopen");
+               (void)close(s);

                exit(1);
        }
                exit(1);
        }

-       fprintf(sfo, "%s\r\n", *argv);
+       while (argc-- > 1)
+               (void)fprintf(sfo, "%s ", *argv++);
+       (void)fprintf(sfo, "%s\r\n", *argv);

        (void)fflush(sfo);
        (void)fflush(sfo);

-       while ((c = getc(sfi)) != EOF)
-               putchar(c);
+       while ((ch = getc(sfi)) != EOF)
+               putchar(ch);
+       exit(0);

 }
 
 }
 

-static

 usage()
 {
 usage()
 {

-       fprintf(stderr, "usage: whois [-h host] name\n");
+       (void)fprintf(stderr, "usage: whois [-h hostname] name ...\n");

        exit(1);
 }
        exit(1);
 }