More hiding, including __mempcpy

6 files changed, 13 insertions, 7 deletions

diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
index 7bf58289b..b09bdfef4 100644
--- a/libc/unistd/exec.c
+++ b/libc/unistd/exec.c
@@ -250,7 +250,7 @@ int execvp(const char *path, char *const argv[])
 			EXEC_FREE(nargv, size2);
 		}
 	} else {
-		if ((p = getenv("PATH")) != NULL) {
+		if ((p = __getenv("PATH")) != NULL) {
 			if (!*p) {
 				goto BAD;
 			}
diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c
index e1685692c..0747a49f6 100644
--- a/libc/unistd/getlogin.c
+++ b/libc/unistd/getlogin.c
@@ -29,14 +29,15 @@
  * the user specify whatever they want via the LOGNAME environment
  * variable, or we return NULL if getenv() fails to find anything */
 
-char * getlogin(void)
+extern char attribute_hidden * __getlogin(void)
 {
-	return (getenv("LOGNAME"));
+	return (__getenv("LOGNAME"));
 }
+strong_alias(__getlogin,getlogin)
 
 int getlogin_r(char *name, size_t len)
 {
-	char * foo = getenv("LOGNAME");
+	char * foo = __getenv("LOGNAME");
 
 	if (! foo)
 		return -1;
@@ -48,7 +49,7 @@ int getlogin_r(char *name, size_t len)
 
 char *cuserid(char *s)
 {
-	char *name = getlogin();
+	char *name = __getlogin();
 	if (s) {
 		return(__strcpy(s, name ? name : ""));
 	}
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index 216e0575a..fc3a013c2 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -247,7 +247,7 @@ static const char *_getopt_initialize (int argc, char *const * argv, const char
 	ordering = REQUIRE_ORDER;
 	++optstring;
     }
-    else if (getenv ("POSIXLY_CORRECT") != NULL)
+    else if (__getenv ("POSIXLY_CORRECT") != NULL)
 	ordering = REQUIRE_ORDER;
     else
 	ordering = PERMUTE;
diff --git a/libc/unistd/sleep.c b/libc/unistd/sleep.c
index 01a9b641b..b704cd905 100644
--- a/libc/unistd/sleep.c
+++ b/libc/unistd/sleep.c
@@ -18,6 +18,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#define sigaction __sigaction_internal
+
 #include <errno.h>
 #include <time.h>
 #include <signal.h>
diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c
index 2346ad831..c80a9e94e 100644
--- a/libc/unistd/sysconf.c
+++ b/libc/unistd/sysconf.c
@@ -16,7 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define getpagesize __libc_getpagesize
+#define getpagesize __getpagesize_internal
+#define getdtablesize __getdtablesize
 
 #define _XOPEN_SOURCE  500
 #include <features.h>
diff --git a/libc/unistd/ualarm.c b/libc/unistd/ualarm.c
index 207a47298..3bcb8e463 100644
--- a/libc/unistd/ualarm.c
+++ b/libc/unistd/ualarm.c
@@ -1,3 +1,5 @@
+#define setitimer __setitimer
+
 #define _GNU_SOURCE
 #include <time.h>
 #include <sys/time.h>