[Midnightbsd-cvs] src: usr.bin/whois: sync with freebsd 7

[laffer1 at midnightbsd.org]

Log Message:
-----------
sync with freebsd 7

Modified Files:
--------------
    src/usr.bin/whois:
        Makefile (r1.2 -> r1.3)
        whois.1 (r1.2 -> r1.3)
        whois.c (r1.2 -> r1.3)

-------------- next part --------------
Index: whois.1
===================================================================
RCS file: /home/cvs/src/usr.bin/whois/whois.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/whois/whois.1 -L usr.bin/whois/whois.1 -u -r1.2 -r1.3
--- usr.bin/whois/whois.1
+++ usr.bin/whois/whois.1
@@ -9,7 +9,7 @@
 .\" 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. Neither the name of the University nor the names of 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.
 .\"
@@ -26,10 +26,10 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.34.2.1 2006/01/31 18:11:21 jhay Exp $
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.36 2006/09/29 15:20:48 ru Exp $
 .\" $MidnightBSD$
 .\"
-.Dd December 27, 2006
+.Dd March 27, 2009
 .Dt WHOIS 1
 .Os
 .Sh NAME
@@ -87,7 +87,7 @@
 .It Fl f
 Use the African Network Information Centre
 .Pq Tn AfriNIC
-database. 
+database.
 It contains network numbers used in Africa and the islands of the
 western Indian Ocean.
 .It Fl g
Index: whois.c
===================================================================
RCS file: /home/cvs/src/usr.bin/whois/whois.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/whois/whois.c -L usr.bin/whois/whois.c -u -r1.2 -r1.3
--- usr.bin/whois/whois.c
+++ usr.bin/whois/whois.c
@@ -10,7 +10,7 @@
  * 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. Neither the name of the University nor the names of 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.
  *
@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/whois/whois.c,v 1.46 2007/04/14 14:32:48 ache Exp $");
 __MBSDID("$MidnightBSD$");
 
 #include <sys/types.h>
@@ -301,6 +301,8 @@
 		err(EX_OSERR, "fdopen()");
 	if (strcmp(hostname, GERMNICHOST) == 0) {
 		fprintf(sfo, "-T dn,ace -C US-ASCII %s\r\n", query);
+	} else if (strcmp(hostname, "dk" QNICHOST_TAIL) == 0) {
+		fprintf(sfo, "--show-handles %s\r\n", query);
 	} else {
 		fprintf(sfo, "%s\r\n", query);
 	}
@@ -336,7 +338,7 @@
 				    (int)(buf + len - host), host);
 			} else if (strcmp(hostname, ANICHOST) == 0) {
 				for (c = 0; c <= len; c++)
-					buf[c] = tolower((int)buf[c]);
+					buf[c] = tolower((unsigned char)buf[c]);
 				for (i = 0; ip_whois[i] != NULL; i++) {
 					if (strnstr(buf, ip_whois[i], len) !=
 					    NULL) {