OS-2178 cscope-fast clobber misses scanner.c

OS-2115 /etc/resolv.conf only handles a fixed number of DNS resolvers (fix debug)

7 files changed, 13 insertions, 40 deletions

diff --git a/usr/src/head/resolv_joy.h b/usr/src/head/resolv_joy.h
index 10e934f276..262cf6121d 100644
--- a/usr/src/head/resolv_joy.h
+++ b/usr/src/head/resolv_joy.h
@@ -92,8 +92,12 @@
  *	$Id: resolv.h,v 8.52 2003/04/29 02:27:03 marka Exp $
  */
 
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
+#ifndef _RESOLV_JOY_H
+#define	_RESOLV_JOY_H
+
+#ifdef	_RESOLV_H_
+#error	"resolv.h and resolv_joy.h should not be used together"
+#endif
 
 #include <sys/param.h>
 
@@ -465,4 +469,4 @@ int		res_getservers __P((res_state,
 }
 #endif
 
-#endif /* !_RESOLV_H_ */
+#endif /* !_RESOLV_JOY_H */
diff --git a/usr/src/lib/libresolv2_joy/include/irs.h b/usr/src/lib/libresolv2_joy/include/irs.h
index 42d4890dfd..386e3cb3f6 100644
--- a/usr/src/lib/libresolv2_joy/include/irs.h
+++ b/usr/src/lib/libresolv2_joy/include/irs.h
@@ -30,7 +30,7 @@
 
 #include <grp.h>
 #include <netdb.h>
-#include <resolv.h>
+#include <resolv_joy.h>
 #include <pwd.h>
 
 /*%
diff --git a/usr/src/lib/libresolv2_joy/include/res_update.h b/usr/src/lib/libresolv2_joy/include/res_update.h
index 419dfc43d5..0c6967db56 100644
--- a/usr/src/lib/libresolv2_joy/include/res_update.h
+++ b/usr/src/lib/libresolv2_joy/include/res_update.h
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <arpa/nameser.h>
 #include <isc/list.h>
-#include <resolv.h>
+#include <resolv_joy.h>
 
 #ifndef	ORIGINAL_ISC_CODE
 /* definition of u_int32_t needed on Solaris */
diff --git a/usr/src/lib/libresolv2_joy/include/resolv_mt.h b/usr/src/lib/libresolv2_joy/include/resolv_mt.h
index 27963a1207..500d4d764c 100644
--- a/usr/src/lib/libresolv2_joy/include/resolv_mt.h
+++ b/usr/src/lib/libresolv2_joy/include/resolv_mt.h
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>
+#include <resolv_joy.h>
 
 /* Access functions for the libresolv private interface */
 
diff --git a/usr/src/lib/libresolv2_joy/include/sunw_port_after.h b/usr/src/lib/libresolv2_joy/include/sunw_port_after.h
index fce7445189..bff64a74c1 100644
--- a/usr/src/lib/libresolv2_joy/include/sunw_port_after.h
+++ b/usr/src/lib/libresolv2_joy/include/sunw_port_after.h
@@ -30,9 +30,9 @@ void endnetgrent(void);
  * from those currently in OpenSolaris.
  */
 
-#ifdef _RESOLV_H_
+#ifdef _RESOLV_JOY_H
 #include <port_resolv.h>
-#endif /* _RESOLV_H_ */
+#endif /* _RESOLV_JOY_H */
 
 #ifdef _NETDB_H
 #include <port_netdb.h>
diff --git a/usr/src/lib/nsswitch/dns/common/dns_mt.c b/usr/src/lib/nsswitch/dns/common/dns_mt.c
index f17cd5170a..4af3f671c0 100644
--- a/usr/src/lib/nsswitch/dns/common/dns_mt.c
+++ b/usr/src/lib/nsswitch/dns/common/dns_mt.c
@@ -76,8 +76,6 @@ extern int	*__joy_h_errno(void);
 extern int	__joy_res_override_retry(int);
 
 static void	__fallback_set_no_hosts(void);
-static int	*__fallback_h_errno(void);
-static int	__fallback_override_retry(int);
 static int	__is_mt_safe(void);
 
 void	(*set_no_hosts_fallback)(void) = __fallback_set_no_hosts;
@@ -141,36 +139,6 @@ __is_mt_safe(void) {
 }
 
 
-/*
- * Return pointer to the global h_errno variable
- */
-static int *
-__fallback_h_errno(void) {
-	return (NULL);
-}
-
-
-/*
- * This function is called when the resolver library doesn't provide its
- * own function to establish an override retry. If we can get a pointer
- * to the per-thread _res (i.e., set_res_retry != 0), we set the retries
- * directly, and return the previous number of retries. Otherwise, there's
- * nothing to do.
- */
-static int
-__fallback_override_retry(int retry) {
-	struct __res_state	*res;
-	int			old_retry = 0;
-
-	if (set_res_retry != 0) {
-		res = set_res_retry();
-		old_retry = res->retry;
-		res->retry = retry;
-	}
-	return (old_retry);
-}
-
-
 static void
 __fallback_set_no_hosts(void) {
 }
diff --git a/usr/src/tools/cscope-fast/Makefile b/usr/src/tools/cscope-fast/Makefile
index 6a2270bbed..0237a6e9e9 100644
--- a/usr/src/tools/cscope-fast/Makefile
+++ b/usr/src/tools/cscope-fast/Makefile
@@ -34,6 +34,7 @@ OBJS= 	main.o dir.o crossref.o scanner.o lookup.o command.o display.o \
 	vpaccess.o vpfopen.o vpinit.o vpopen.o vpstat.o
 SRCS=	$(OBJS:%.o=%.c)
 CLEANFILES += $(OBJS)
+CLOBBERFILES += scanner.c
 TMPDIR= /tmp
 
 include ../Makefile.tools