Hide some of the f* *printf, use them as well

16 files changed, 37 insertions, 9 deletions

diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index e33c50f0a..46ea8a212 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define isatty __isatty
+
 #include "_stdio.h"
 
 /*
diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c
index b5f11419c..727f9e363 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define isatty __isatty
+
 #include "_stdio.h"
 
 /* This is pretty much straight from uClibc, but with one important
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c
index 36ed807a4..207b35a3c 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define vasprintf __vasprintf
+
 #include "_stdio.h"
 #include <stdarg.h>
 
@@ -12,7 +14,7 @@
 #warning Skipping asprintf and __asprintf since no vsnprintf!
 #else
 
-int __asprintf(char **__restrict buf, const char * __restrict format, ...)
+int attribute_hidden __asprintf(char **__restrict buf, const char * __restrict format, ...)
 {
 	va_list arg;
 	int rv;
@@ -24,6 +26,6 @@ int __asprintf(char **__restrict buf, const char * __restrict format, ...)
 	return rv;
 }
 
-weak_alias(__asprintf,asprintf)
+strong_alias(__asprintf,asprintf)
 
 #endif
diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c
index dfdd4977d..1fc46c722 100644
--- a/libc/stdio/dprintf.c
+++ b/libc/stdio/dprintf.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define vdprintf __vdprintf
+
 #include "_stdio.h"
 #include <stdarg.h>
 
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index fa08c976d..9b08b4b71 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-FILE *fdopen(int filedes, const char *mode)
+FILE attribute_hidden *__fdopen(int filedes, const char *mode)
 {
 	intptr_t cur_mode;
 
@@ -15,3 +15,4 @@ FILE *fdopen(int filedes, const char *mode)
 		? _stdio_fopen(cur_mode, mode, NULL, filedes) 
 		: NULL;
 }
+strong_alias(__fdopen,fdopen)
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index 4ea21d748..526a4eb9f 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -23,12 +23,13 @@ int attribute_hidden __fileno_unlocked(register FILE *stream)
 
 weak_alias(__fileno_unlocked,fileno_unlocked);
 #ifndef __UCLIBC_HAS_THREADS__
+hidden_weak_alias(__fileno_unlocked,__fileno);
 weak_alias(__fileno_unlocked,fileno);
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-int fileno(register FILE *stream)
+int attribute_hidden __fileno(register FILE *stream)
 {
 	int retval;
 	__STDIO_AUTO_THREADLOCK_VAR;
@@ -41,5 +42,5 @@ int fileno(register FILE *stream)
 
 	return retval;
 }
-
+strong_alias(__fileno,fileno)
 #endif
diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c
index 7febe1a6e..fc7870258 100644
--- a/libc/stdio/fmemopen.c
+++ b/libc/stdio/fmemopen.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define fopencookie __fopencookie
+
 #include "_stdio.h"
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index 73a5a028a..a70e17b80 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -28,7 +28,7 @@
 /* Currently no real reentrancy issues other than a possible double close(). */
 
 #ifndef __BCC__
-FILE *fopencookie(void * __restrict cookie, const char * __restrict mode,
+FILE attribute_hidden *__fopencookie(void * __restrict cookie, const char * __restrict mode,
 				  cookie_io_functions_t io_functions)
 #else
 FILE *_fopencookie(void * __restrict cookie, const char * __restrict mode,
@@ -57,3 +57,6 @@ FILE *_fopencookie(void * __restrict cookie, const char * __restrict mode,
 
 	return stream;
 }
+#ifndef __BCC__
+strong_alias(__fopencookie,fopencookie)
+#endif
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index 5799005d9..f750cd11c 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define fopencookie __fopencookie
+
 #include "_stdio.h"
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 00c2d7bb1..14a36aa64 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -17,6 +17,7 @@
 #define waitpid __waitpid
 #define execl __execl
 #define dup2 __dup2
+#define fdopen __fdopen
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c
index aaef3342b..d471ae291 100644
--- a/libc/stdio/remove.c
+++ b/libc/stdio/remove.c
@@ -5,6 +5,9 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define rmdir __rmdir
+#define unlink __unlink
+
 #include "_stdio.h"
 
 #include <unistd.h>
diff --git a/libc/stdio/swprintf.c b/libc/stdio/swprintf.c
index bdb092403..b373df8bd 100644
--- a/libc/stdio/swprintf.c
+++ b/libc/stdio/swprintf.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define vswprintf __vswprintf
+
 #include "_stdio.h"
 #include <stdarg.h>
 #include <wchar.h>
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index 488ddd763..fa9bd5019 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -16,6 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#define fdopen __fdopen
+
 #include <features.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 512317c51..8aa2c9a7f 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -20,7 +20,7 @@
 #warning Skipping vasprintf since no vsnprintf!
 #else
 
-int vasprintf(char **__restrict buf, const char * __restrict format,
+int attribute_hidden __vasprintf(char **__restrict buf, const char * __restrict format,
 			 va_list arg)
 {
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
@@ -73,6 +73,7 @@ int vasprintf(char **__restrict buf, const char * __restrict format,
 	return rv;
 
 #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ */
+strong_alias(__vasprintf,vasprintf)
 }
 
 #endif
diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c
index de8362c20..5628738b1 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-int vdprintf(int filedes, const char * __restrict format, va_list arg)
+int attribute_hidden __vdprintf(int filedes, const char * __restrict format, va_list arg)
 {
 	FILE f;
 	int rv;
@@ -60,3 +60,4 @@ int vdprintf(int filedes, const char * __restrict format, va_list arg)
 
 	return rv;
 }
+strong_alias(__vdprintf,vdprintf)
diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c
index a5839b7bd..d7dca5e49 100644
--- a/libc/stdio/vswprintf.c
+++ b/libc/stdio/vswprintf.c
@@ -13,7 +13,7 @@
 #warning Skipping vswprintf since no buffering!
 #else  /* __STDIO_BUFFERS */
 
-int vswprintf(wchar_t *__restrict buf, size_t size,
+int attribute_hidden __vswprintf(wchar_t *__restrict buf, size_t size,
 			  const wchar_t * __restrict format, va_list arg)
 {
 	FILE f;
@@ -66,5 +66,6 @@ int vswprintf(wchar_t *__restrict buf, size_t size,
 	}
 	return rv;
 }
+strong_alias(__vswprintf,vswprintf)
 
 #endif /* __STDIO_BUFFERS */