Add framework for resolving (pun intended) libc namespace issues, using

wrapper .h files and asm labels to let internal calls resolve directly and
not be overridable or use the PLT.  Then, apply that framework to most of
the functions in stdio.h, string.h, err.h, and wchar.h.  Delete the
should-have-been-hidden-all-along _v?(err|warn)[cx]? symbols while here.

tests clean on i386, amd64, sparc64, powerpc, and mips64

naming feedback from kettenis@ and millert@
ok kettenis@

1 files changed, 109 insertions, 0 deletions

diff --git a/lib/libc/hidden/stdio.h b/lib/libc/hidden/stdio.h
new file mode 100644
index 00000000000..8a5530cd54f
--- /dev/null
+++ b/lib/libc/hidden/stdio.h
@@ -0,0 +1,109 @@
+/*	$OpenBSD: stdio.h,v 1.1 2015/08/31 02:53:56 guenther Exp $	*/
+/*
+ * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/*	$OpenBSD: stdio.h,v 1.1 2015/08/31 02:53:56 guenther Exp $	*/
+/*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
+
+#ifndef	_LIBC_STDIO_H_
+#define	_LIBC_STDIO_H_
+
+#include_next <stdio.h>
+#include "namespace.h"
+
+__BEGIN_HIDDEN_DECLS
+char	*_mktemp(char *);
+__END_HIDDEN_DECLS
+
+PROTO_NORMAL(__srget);
+PROTO_NORMAL(__swbuf);
+PROTO_NORMAL(asprintf);
+PROTO_NORMAL(clearerr);
+PROTO_NORMAL(ctermid);
+PROTO_NORMAL(dprintf);
+PROTO_NORMAL(fclose);
+PROTO_NORMAL(fdopen);
+PROTO_NORMAL(feof);
+PROTO_NORMAL(ferror);
+PROTO_NORMAL(fflush);
+PROTO_NORMAL(fgetc);
+PROTO_NORMAL(fgetln);
+PROTO_NORMAL(fgetpos);
+PROTO_NORMAL(fgets);
+PROTO_NORMAL(fileno);
+/*PROTO_NORMAL(flockfile);*/
+PROTO_NORMAL(fmemopen);
+PROTO_NORMAL(fopen);
+PROTO_NORMAL(fprintf);
+PROTO_NORMAL(fpurge);
+PROTO_NORMAL(fputc);
+PROTO_NORMAL(fputs);
+PROTO_NORMAL(fread);
+PROTO_NORMAL(freopen);
+PROTO_NORMAL(fscanf);
+PROTO_NORMAL(fseek);
+PROTO_NORMAL(fseeko);
+PROTO_NORMAL(fsetpos);
+PROTO_NORMAL(ftell);
+PROTO_NORMAL(ftello);
+/*PROTO_NORMAL(ftrylockfile);*/
+/*PROTO_NORMAL(funlockfile);*/
+PROTO_NORMAL(funopen);
+PROTO_NORMAL(fwrite);
+PROTO_NORMAL(getc);
+PROTO_NORMAL(getc_unlocked);
+PROTO_NORMAL(getchar);
+PROTO_NORMAL(getchar_unlocked);
+PROTO_NORMAL(getdelim);
+PROTO_NORMAL(getline);
+PROTO_NORMAL(getw);
+PROTO_NORMAL(open_memstream);
+PROTO_NORMAL(pclose);
+PROTO_NORMAL(perror);
+PROTO_NORMAL(popen);
+PROTO_NORMAL(printf);
+PROTO_NORMAL(putc);
+PROTO_NORMAL(putc_unlocked);
+PROTO_NORMAL(putchar);
+PROTO_NORMAL(putchar_unlocked);
+PROTO_NORMAL(puts);
+PROTO_NORMAL(putw);
+PROTO_NORMAL(remove);
+/*PROTO_NORMAL(rename);*/
+/*PROTO_NORMAL(renameat);*/
+PROTO_NORMAL(rewind);
+PROTO_NORMAL(scanf);
+PROTO_NORMAL(setbuf);
+PROTO_NORMAL(setbuffer);
+PROTO_NORMAL(setlinebuf);
+PROTO_NORMAL(setvbuf);
+PROTO_NORMAL(snprintf);
+PROTO_STD_DEPRECATED(sprintf);
+PROTO_NORMAL(sscanf);
+PROTO_DEPRECATED(tempnam);
+PROTO_NORMAL(tmpfile);
+PROTO_STD_DEPRECATED(tmpnam);
+PROTO_NORMAL(ungetc);
+PROTO_NORMAL(vasprintf);
+PROTO_NORMAL(vdprintf);
+PROTO_NORMAL(vfprintf);
+PROTO_NORMAL(vfscanf);
+PROTO_NORMAL(vprintf);
+PROTO_NORMAL(vscanf);
+PROTO_NORMAL(vsnprintf);
+PROTO_STD_DEPRECATED(vsprintf);
+PROTO_NORMAL(vsscanf);
+
+#endif /* _LIBC_STDIO_H_ */