===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/whois/whois.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/whois/whois.c	2005/06/25 14:21:34	1.33
--- src/usr.bin/whois/whois.c	2005/06/25 14:27:36	1.34
***************
*** 1,4 ****
! /*      $OpenBSD: whois.c,v 1.33 2005/06/25 14:21:34 henning Exp $   */
  
  /*
   * Copyright (c) 1980, 1993
--- 1,4 ----
! /*      $OpenBSD: whois.c,v 1.34 2005/06/25 14:27:36 henning Exp $   */
  
  /*
   * Copyright (c) 1980, 1993
***************
*** 29,48 ****
   * SUCH DAMAGE.
   */
  
- #ifndef lint
- static const char copyright[] =
- "@(#) Copyright (c) 1980, 1993\n\
- 	The Regents of the University of California.  All rights reserved.\n";
- #endif /* not lint */
- 
- #ifndef lint
- #if 0
- static const char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
- #else
- static const char rcsid[] = "$OpenBSD: whois.c,v 1.33 2005/06/25 14:21:34 henning Exp $";
- #endif
- #endif /* not lint */
- 
  #include <sys/types.h>
  #include <sys/socket.h>
  
--- 29,34 ----
***************
*** 81,89 ****
  const char *port = WHOIS_PORT;
  const char *ip_whois[] = { LNICHOST, RNICHOST, PNICHOST, BNICHOST, NULL };
  
! static __dead void usage(void);
! static int whois(const char *, const char *, const char *, int);
! static char *choose_server(const char *, const char *);
  
  int
  main(int argc, char *argv[])
--- 67,75 ----
  const char *port = WHOIS_PORT;
  const char *ip_whois[] = { LNICHOST, RNICHOST, PNICHOST, BNICHOST, NULL };
  
! __dead void usage(void);
! int whois(const char *, const char *, const char *, int);
! char *choose_server(const char *, const char *);
  
  int
  main(int argc, char *argv[])
***************
*** 91,103 ****
  	int ch, flags, rval;
  	char *host, *name, *country, *server;
  
- #ifdef SOCKS
- 	SOCKSinit(argv[0]);
- #endif
  	country = host = server = NULL;
  	flags = rval = 0;
  	while ((ch = getopt(argc, argv, "aAc:dgh:ilmp:qQrR6")) != -1)
! 		switch(ch) {
  		case 'a':
  			host = ANICHOST;
  			break;
--- 77,86 ----
  	int ch, flags, rval;
  	char *host, *name, *country, *server;
  
  	country = host = server = NULL;
  	flags = rval = 0;
  	while ((ch = getopt(argc, argv, "aAc:dgh:ilmp:qQrR6")) != -1)
! 		switch (ch) {
  		case 'a':
  			host = ANICHOST;
  			break;
***************
*** 160,166 ****
  	exit(rval);
  }
  
! static int
  whois(const char *query, const char *server, const char *port, int flags)
  {
  	FILE *sfi, *sfo;
--- 143,149 ----
  	exit(rval);
  }
  
! int
  whois(const char *query, const char *server, const char *port, int flags)
  {
  	FILE *sfi, *sfo;
***************
*** 185,195 ****
  
  	for (s = -1, ai = res; ai != NULL; ai = ai->ai_next) {
  		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
! 		if (s < 0) {
  			reason = "socket";
  			continue;
  		}
! 		if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0) {
  			reason = "connect";
  			close(s);
  			s = -1;
--- 168,178 ----
  
  	for (s = -1, ai = res; ai != NULL; ai = ai->ai_next) {
  		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
! 		if (s == -1) {
  			reason = "socket";
  			continue;
  		}
! 		if (connect(s, ai->ai_addr, ai->ai_addrlen) == -1) {
  			reason = "connect";
  			close(s);
  			s = -1;
***************
*** 197,203 ****
  		}
  		break;	/*okay*/
  	}
! 	if (s < 0) {
  		if (reason)
  			warn("%s: %s", server, reason);
  		else
--- 180,186 ----
  		}
  		break;	/*okay*/
  	}
! 	if (s == -1) {
  		if (reason)
  			warn("%s: %s", server, reason);
  		else
***************
*** 216,223 ****
  	sfo = fdopen(s, "w");
  	if (sfi == NULL || sfo == NULL)
  		err(1, "fdopen");
! 	(void)fprintf(sfo, fmt, query);
! 	(void)fflush(sfo);
  	nhost = NULL;
  	while ((buf = fgetln(sfi, &len)) != NULL) {
  		p = buf + len - 1;
--- 199,206 ----
  	sfo = fdopen(s, "w");
  	if (sfi == NULL || sfo == NULL)
  		err(1, "fdopen");
! 	fprintf(sfo, fmt, query);
! 	fflush(sfo);
  	nhost = NULL;
  	while ((buf = fgetln(sfi, &len)) != NULL) {
  		p = buf + len - 1;
***************
*** 232,238 ****
  			nbuf[len] = '\0';
  			buf = nbuf;
  		}
! 		(void)puts(buf);
  
  		if (nhost != NULL || !(flags & WHOIS_RECURSE))
  			continue;
--- 215,221 ----
  			nbuf[len] = '\0';
  			buf = nbuf;
  		}
! 		puts(buf);
  
  		if (nhost != NULL || !(flags & WHOIS_RECURSE))
  			continue;
***************
*** 278,284 ****
   * (starts with '!') or a CORE handle (COCO-[0-9]+ or COHO-[0-9]+).
   * Fall back to NICHOST for the non-handle case.
   */
! static char *
  choose_server(const char *name, const char *country)
  {
  	static char *server;
--- 261,267 ----
   * (starts with '!') or a CORE handle (COCO-[0-9]+ or COHO-[0-9]+).
   * Fall back to NICHOST for the non-handle case.
   */
! char *
  choose_server(const char *name, const char *country)
  {
  	static char *server;
***************
*** 294,300 ****
  		else if ((strncasecmp(name, "COCO-", 5) == 0 ||
  		    strncasecmp(name, "COHO-", 5) == 0) &&
  		    strtol(name + 5, &ep, 10) > 0 && *ep == '\0')
! 			return (CNICHOST);  
  		else
  			return (NICHOST);
  	} else if (isdigit(*(++qhead)))
--- 277,283 ----
  		else if ((strncasecmp(name, "COCO-", 5) == 0 ||
  		    strncasecmp(name, "COHO-", 5) == 0) &&
  		    strtol(name + 5, &ep, 10) > 0 && *ep == '\0')
! 			return (CNICHOST);
  		else
  			return (NICHOST);
  	} else if (isdigit(*(++qhead)))
***************
*** 307,318 ****
  	return (server);
  }
  
! static __dead void
  usage(void)
  {
  	extern char *__progname;
  
! 	(void)fprintf(stderr,
  	    "usage: %s [-6AadgilmQRr] [-c country-code | -h hostname] "
  		"[-p port] name ...\n", __progname);
  	exit(1);
--- 290,301 ----
  	return (server);
  }
  
! __dead void
  usage(void)
  {
  	extern char *__progname;
  
! 	fprintf(stderr,
  	    "usage: %s [-6AadgilmQRr] [-c country-code | -h hostname] "
  		"[-p port] name ...\n", __progname);
  	exit(1);