Implement hidden poll, switch user to hidden *printf/*scanf/poll

8 files changed, 14 insertions, 7 deletions

diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index 49e4fd725..922cd8aba 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define vfprintf __vfprintf
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 0a19e3923..5427e9568 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -23,6 +23,7 @@
 /* Adjusted slightly by Erik Andersen <andersen@uclibc.org> */
 
 #define strerror __strerror
+#define vfprintf __vfprintf
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 53500a7a6..ef41cb62f 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -118,7 +118,7 @@ int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir
 	return -1;
     }
 
-    sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+    __sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
     return 0;
 }
 
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index c86835e17..6bb319acd 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -34,6 +34,7 @@
 #define wctype __wctype
 #define iswctype __iswctype
 #define iswalnum __iswalnum
+#define printf __printf
 
 /* To exclude some unwanted junk.... */
 #undef _LIBC
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index 504154f90..f21d8d12d 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -34,6 +34,7 @@
 #define ctime __ctime
 #define sigaction __sigaction
 #define connect __connect
+#define vsnprintf __vsnprintf
 
 #define __FORCE_GLIBC
 #define _GNU_SOURCE
@@ -220,15 +221,15 @@ __vsyslog( int pri, const char *fmt, va_list ap )
 	 * safe to test only LogTag and use normal sprintf everywhere else.
 	 */
 	(void)__time(&now);
-	stdp = p = tbuf + sprintf(tbuf, "<%d>%.15s ", pri, ctime(&now) + 4);
+	stdp = p = tbuf + __sprintf(tbuf, "<%d>%.15s ", pri, ctime(&now) + 4);
 	if (LogTag) {
 		if (__strlen(LogTag) < sizeof(tbuf) - 64)
-			p += sprintf(p, "%s", LogTag);
+			p += __sprintf(p, "%s", LogTag);
 		else
-			p += sprintf(p, "<BUFFER OVERRUN ATTEMPT>");
+			p += __sprintf(p, "<BUFFER OVERRUN ATTEMPT>");
 	}
 	if (LogStat & LOG_PID)
-		p += sprintf(p, "[%d]", __getpid());
+		p += __sprintf(p, "[%d]", __getpid());
 	if (LogTag) {
 		*p++ = ':';
 		*p++ = ' ';
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 85a96f003..e9ca07e4b 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -274,7 +274,7 @@ strong_alias(__asctime,asctime)
  *       };
  *       static char result[26];
  *   
- *       sprintf(result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
+ *       __sprintf(result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
  *           wday_name[timeptr->tm_wday],                   
  *           mon_name[timeptr->tm_mon],
  *           timeptr->tm_mday, timeptr->tm_hour,
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 1a16fc9d6..4ef93eaff 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -98,6 +98,8 @@
  * Manuel
  */
 
+#define vfprintf __vfprintf
+
 #define _GNU_SOURCE
 #define _ISOC99_SOURCE
 #include <errno.h>
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index 8c54f8fc2..a850b2aca 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -509,7 +509,7 @@ static int eval_expr(char *expr, long int *result);
 
 static char *_itoa(unsigned long long int value, char *buflim)
 {
-	sprintf(buflim, "%llu", value);
+	__sprintf(buflim, "%llu", value);
 	return buflim;
 }