Fixed namespace pollution related to `warn' in libc (but not in other

libraries or for other members of the err() family).

This fixes world breakage in bc and rcs/* for NOSHARED worlds.

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 6d1766c..528fa86 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -37,7 +37,9 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
+#include "namespace.h"
 #include <err.h>
+#include "un-namespace.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -143,8 +145,10 @@ verrx(eval, fmt, ap)
 	exit(eval);
 }
 
+__weak_reference(_warn, warn);
+
 void
-warn(const char *fmt, ...)
+_warn(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index b1ddd86..9918955 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -32,13 +32,20 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 
 #include <stdio.h>
+#include "namespace.h"
 #include <err.h>
+#include "un-namespace.h"
 #include <unistd.h>
 
 int
@@ -53,7 +60,7 @@ initgroups(uname, agroup)
 		warnx("%s is in too many groups, using first %d",
 		    uname, ngroups);
 	if (setgroups(ngroups, groups) < 0) {
-		warn("setgroups");
+		_warn("setgroups");
 		return (-1);
 	}
 	return (0);