Hide mostly used functions

32 files changed, 207 insertions, 199 deletions

diff --git a/libc/misc/dirent/alphasort.c b/libc/misc/dirent/alphasort.c
index dcf970070..feae021e6 100644
--- a/libc/misc/dirent/alphasort.c
+++ b/libc/misc/dirent/alphasort.c
@@ -4,7 +4,7 @@
 
 int alphasort(const void * a, const void * b)
 {
-    return strcmp ((*(const struct dirent **) a)->d_name,
+    return __strcmp ((*(const struct dirent **) a)->d_name,
 	    (*(const struct dirent **) b)->d_name);
 }
 
diff --git a/libc/misc/dirent/alphasort64.c b/libc/misc/dirent/alphasort64.c
index bcae8108f..5801f4940 100644
--- a/libc/misc/dirent/alphasort64.c
+++ b/libc/misc/dirent/alphasort64.c
@@ -19,7 +19,7 @@
 
 int alphasort64(const void * a, const void * b)
 {
-    return strcmp ((*(const struct dirent64 **) a)->d_name,
+    return __strcmp ((*(const struct dirent64 **) a)->d_name,
 	    (*(const struct dirent64 **) b)->d_name);
 }
 #endif /* __UCLIBC_HAS_LFS__ */
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 068e2d3e2..57600ab69 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -29,5 +29,5 @@ int closedir(DIR * dir)
 #endif
 	free(dir->dd_buf);
 	free(dir);
-	return close(fd);
+	return __close(fd);
 }
diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index 017684b40..9f5f75e3f 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -24,7 +24,7 @@ DIR *opendir(const char *name)
 		__set_errno(ENOTDIR);
 		return NULL;
 	}
-	if ((fd = open(name, O_RDONLY)) < 0)
+	if ((fd = __open(name, O_RDONLY)) < 0)
 		return NULL;
 	/* According to POSIX, directory streams should be closed when
 	 * exec. From "Anna Pluzhnikov" <besp@midway.uchicago.edu>.
@@ -32,7 +32,7 @@ DIR *opendir(const char *name)
 	if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
 		return NULL;
 	if (!(ptr = malloc(sizeof(*ptr)))) {
-		close(fd);
+		__close(fd);
 		__set_errno(ENOMEM);
 		return NULL;
 	}
@@ -45,7 +45,7 @@ DIR *opendir(const char *name)
 		ptr->dd_max = 512;
 
 	if (!(buf = calloc(1, ptr->dd_max))) {
-		close(fd);
+		__close(fd);
 		free(ptr);
 		__set_errno(ENOMEM);
 		return NULL;
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index da3564edb..1daae5116 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -62,7 +62,7 @@ int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
 	if (de == NULL) {
 	    *result = NULL;
 	} else {
-	    *result = memcpy (entry, de, de->d_reclen);
+	    *result = __memcpy (entry, de, de->d_reclen);
 	}
 	ret = 0;
 
diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c
index 245dcbdde..1c8eeadce 100644
--- a/libc/misc/dirent/readdir_r.c
+++ b/libc/misc/dirent/readdir_r.c
@@ -48,7 +48,7 @@ int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 	if (de == NULL) {
 	    *result = NULL;
 	} else {
-	    *result = memcpy (entry, de, de->d_reclen);
+	    *result = __memcpy (entry, de, de->d_reclen);
 	}
 	ret = 0;
 
diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c
index cb3d505db..8b08e4884 100644
--- a/libc/misc/dirent/scandir.c
+++ b/libc/misc/dirent/scandir.c
@@ -72,7 +72,7 @@ int scandir(const char *dir, struct dirent ***namelist,
 	    if (vnew == NULL)
 		break;
 
-	    names[pos++] = (struct dirent *) memcpy (vnew, current, dsize);
+	    names[pos++] = (struct dirent *) __memcpy (vnew, current, dsize);
 	}
 
     if (unlikely(errno != 0))
diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index b4cc57a36..2916285eb 100644
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -87,7 +87,7 @@ int scandir64(const char *dir, struct dirent64 ***namelist,
 	    if (vnew == NULL)
 		break;
 
-	    names[pos++] = (struct dirent64 *) memcpy (vnew, current, dsize);
+	    names[pos++] = (struct dirent64 *) __memcpy (vnew, current, dsize);
 	}
 
     if (unlikely(errno != 0))
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 576d11154..0a19e3923 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -70,7 +70,7 @@ void __error_at_line (int status, int errnum, const char *file_name,
 	static unsigned int old_line_number;
 
 	if (old_line_number == line_number &&
-		(file_name == old_file_name || !strcmp (old_file_name, file_name)))
+		(file_name == old_file_name || !__strcmp (old_file_name, file_name)))
 	    /* Simply return and print nothing.  */
 	    return;
 
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index f95b24fac..0962031da 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -28,7 +28,7 @@ int lockf (int fd, int cmd, off_t len)
 {
     struct flock fl;
 
-    memset ((char *) &fl, '\0', sizeof (fl));
+    __memset ((char *) &fl, '\0', sizeof (fl));
 
     /* lockf is always relative to the current file position.  */
     fl.l_whence = SEEK_CUR;
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index 5638d6938..eb70e8ddd 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -62,7 +62,7 @@ int lockf64 (int fd, int cmd, off64_t len64)
 	return -1;
     }
 
-    memset((char *) &fl, '\0', sizeof (fl));
+    __memset((char *) &fl, '\0', sizeof (fl));
 
     /* lockf is always relative to the current file position.  */
     fl.l_whence = SEEK_CUR;
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 48b385c19..c36ae45b6 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -18,7 +18,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define mempcpy __libc_mempcpy
+/* used by D_EXACT_NAMLEN */
+#define strlen __strlen
+
+#define mempcpy __mempcpy
 #define tsearch __tsearch
 
 #define _GNU_SOURCE
@@ -424,7 +427,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
 
     /* Next, update the `struct FTW' information.  */
     ++data->ftw.level;
-    startp = strchr (data->dirbuf, '\0');
+    startp = __strchr (data->dirbuf, '\0');
     /* There always must be a directory name.  */
     assert (startp != data->dirbuf);
     if (startp[-1] != '/')
@@ -460,7 +463,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
 
 	while (result == 0 && *runp != '\0')
 	{
-	    char *endp = strchr (runp, '\0');
+	    char *endp = __strchr (runp, '\0');
 
 	    result = process_entry (data, &dir, runp, endp - runp);
 
@@ -501,7 +504,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, int flag
 	__set_errno (ENOENT);
 	return -1;
     }
-    if ((strlen(dir)+1) > NAME_MAX) {
+    if ((__strlen(dir)+1) > NAME_MAX) {
 	__set_errno(ENAMETOOLONG);
 	return -1;
     }
@@ -510,10 +513,10 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, int flag
     data.actdir = 0;
     data.dirstreams = (struct dir_data **) alloca (data.maxdir
 	    * sizeof (struct dir_data *));
-    memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
+    __memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
 
     /* PATH_MAX is always defined when we get here.  */
-    data.dirbufsize = MAX (2 * strlen (dir), PATH_MAX);
+    data.dirbufsize = MAX (2 * __strlen (dir), PATH_MAX);
     data.dirbuf = (char *) malloc (data.dirbufsize);
     if (data.dirbuf == NULL)
 	return -1;
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 246402113..22f1874ab 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -127,7 +127,7 @@ glob (pattern, flags, errfunc, pglob)
     {
       dirlen = filename - pattern;
       dirname = (char *) alloca (dirlen + 1);
-      memcpy (dirname, pattern, dirlen);
+      __memcpy (dirname, pattern, dirlen);
       dirname[dirlen] = '\0';
       ++filename;
     }
@@ -219,11 +219,11 @@ glob (pattern, flags, errfunc, pglob)
 	/* No matches.  */
 	if (flags & GLOB_NOCHECK)
 	{
-	    size_t len = strlen (pattern) + 1;
+	    size_t len = __strlen (pattern) + 1;
 	    char *patcopy = (char *) malloc (len);
 	    if (patcopy == NULL)
 	      return GLOB_NOSPACE;
-	    memcpy (patcopy, pattern, len);
+	    __memcpy (patcopy, pattern, len);
 
 	    pglob->gl_pathv
 	      = (char **) realloc (pglob->gl_pathv,
@@ -281,7 +281,7 @@ glob (pattern, flags, errfunc, pglob)
       for (i = oldcount; i < pglob->gl_pathc; ++i)
 	if (lstat (pglob->gl_pathv[i], &st) == 0 &&
 	    S_ISDIR (st.st_mode))
-	  strcat (pglob->gl_pathv[i], "/");
+	  __strcat (pglob->gl_pathv[i], "/");
     }
 
   if (!(flags & GLOB_NOSORT))
@@ -343,7 +343,7 @@ prefix_array (dirname, array, n, add_slash)
      int add_slash;
 {
   register size_t i;
-  size_t dirlen = strlen (dirname);
+  size_t dirlen = __strlen (dirname);
 
   if (dirlen == 1 && dirname[0] == '/')
     /* DIRNAME is just "/", so normal prepending would get us "//foo".
@@ -352,7 +352,7 @@ prefix_array (dirname, array, n, add_slash)
 
   for (i = 0; i < n; ++i)
     {
-      size_t eltlen = strlen (array[i]) + 1;
+      size_t eltlen = __strlen (array[i]) + 1;
       char *new = (char *) malloc (dirlen + 1 + eltlen + (add_slash ? 1 : 0));
       if (new == NULL)
 	{
@@ -361,9 +361,9 @@ prefix_array (dirname, array, n, add_slash)
 	  return 1;
 	}
 
-      memcpy (new, dirname, dirlen);
+      __memcpy (new, dirname, dirlen);
       new[dirlen] = '/';
-      memcpy (&new[dirlen + 1], array[i], eltlen);
+      __memcpy (&new[dirlen + 1], array[i], eltlen);
       free ((__ptr_t) array[i]);
       array[i] = new;
     }
@@ -436,7 +436,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 #endif
 	}
 		
-      if ((!meta && strcmp (pattern, name) == 0)
+      if ((!meta && __strcmp (pattern, name) == 0)
 	  || fnmatch (pattern, name,
 		      (!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0) |
 		      ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)) == 0)
@@ -444,12 +444,12 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 	  struct globlink *new
 	    = (struct globlink *) alloca (sizeof (struct globlink));
 	  if (len == 0)
-	    len = strlen (name);
+	    len = __strlen (name);
 	  new->name
 	    = (char *) malloc (len + ((flags & GLOB_MARK) ? 1 : 0) + 1);
 	  if (new->name == NULL)
 	    goto memory_error;
-	  memcpy ((__ptr_t) new->name, name, len);
+	  __memcpy ((__ptr_t) new->name, name, len);
 	  new->name[len] = '\0';
 	  new->next = names;
 	  names = new;
@@ -461,14 +461,14 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 
   if (nfound == 0 && (flags & GLOB_NOCHECK))
     {
-      size_t len = strlen (pattern);
+      size_t len = __strlen (pattern);
       nfound = 1;
       names = (struct globlink *) alloca (sizeof (struct globlink));
       names->next = NULL;
       names->name = (char *) malloc (len + (flags & GLOB_MARK ? 1 : 0) + 1);
       if (names->name == NULL)
 	goto memory_error;
-      memcpy (names->name, pattern, len);
+      __memcpy (names->name, pattern, len);
       names->name[len] = '\0';
     }
 
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 48b3b6e7d..a46465398 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -80,9 +80,9 @@ const char *__progname = 0;
 #endif
 
 extern int __libc_fcntl(int fd, int cmd, ...);
-extern int __libc_open(const char *file, int flags, ...);
 
 #ifdef __ARCH_HAS_MMU__
+
 static void __check_one_fd(int fd, int mode)
 {
     /* Check if the specified fd is already open */
@@ -90,7 +90,7 @@ static void __check_one_fd(int fd, int mode)
     {
 	/* The descriptor is probably not open, so try to use /dev/null */
 	struct stat st;
-	int nullfd = __libc_open(_PATH_DEVNULL, mode);
+	int nullfd = __open(_PATH_DEVNULL, mode);
 	/* /dev/null is major=1 minor=3.  Make absolutely certain
 	 * that is in fact the device that we have opened and not
 	 * some other wierd file... */
@@ -229,7 +229,7 @@ __uClibc_main(int (*main)(int, char **, char **), int argc,
     while (*aux_dat) {
 	ElfW(auxv_t) *auxv_entry = (ElfW(auxv_t) *) aux_dat;
 	if (auxv_entry->a_type <= AT_EGID) {
-	    memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
+	    __memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
 	}
 	aux_dat += 2;
     }
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 589d627ae..360c76879 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -31,6 +31,8 @@
  * Use brain damaged getpid() if real random fails.
  */
 
+#define open64 __open64
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -72,7 +74,7 @@ int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir
     }
     else
     {
-	plen = strlen (pfx);
+	plen = __strlen (pfx);
 	if (plen > 5)
 	    plen = 5;
     }
@@ -94,7 +96,7 @@ int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir
     {
 	if (direxists (P_tmpdir))
 	    dir = P_tmpdir;
-	else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+	else if (__strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
 	    dir = "/tmp";
 	else
 	{
@@ -103,7 +105,7 @@ int attribute_hidden __path_search (char *tmpl, size_t tmpl_len, const char *dir
 	}
     }
 
-    dlen = strlen (dir);
+    dlen = __strlen (dir);
     while (dlen > 1 && dir[dlen - 1] == '/')
 	dlen--;			/* remove trailing slashes */
 
@@ -126,13 +128,13 @@ static unsigned int fillrand(unsigned char *buf, unsigned int len)
 {
     int fd;
     unsigned int result = -1;
-    fd = open("/dev/urandom", O_RDONLY);
+    fd = __open("/dev/urandom", O_RDONLY);
     if (fd < 0) {
-	fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+	fd = __open("/dev/random", O_RDONLY | O_NONBLOCK);
     }
     if (fd >= 0) {
-	result = read(fd, buf, len);
-	close(fd);
+	result = __read(fd, buf, len);
+	__close(fd);
     }
     return result;
 }
@@ -182,8 +184,8 @@ int attribute_hidden __gen_tempname (char *tmpl, int kind)
     int len, i, count, fd, save_errno = errno;
     unsigned char randomness[6];
 
-    len = strlen (tmpl);
-    if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+    len = __strlen (tmpl);
+    if (len < 6 || __strcmp (&tmpl[len - 6], "XXXXXX"))
     {
 	__set_errno (EINVAL);
 	return -1;
@@ -223,7 +225,7 @@ int attribute_hidden __gen_tempname (char *tmpl, int kind)
 			continue;
 		}
 	    case __GT_FILE:
-		fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+		fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 		break;
 #if defined __UCLIBC_HAS_LFS__
 	    case __GT_BIGFILE:
diff --git a/libc/misc/intl/intl.c b/libc/misc/intl/intl.c
index f3255828c..e882f441c 100644
--- a/libc/misc/intl/intl.c
+++ b/libc/misc/intl/intl.c
@@ -60,7 +60,7 @@ char *__uClibc_textdomain(const char *domainname)
 {
 	static const char default_str[] = "messages";
 
-	if (domainname && *domainname && strcmp(domainname, default_str)) {
+	if (domainname && *domainname && __strcmp(domainname, default_str)) {
 		__set_errno(EINVAL);
 		return NULL;
 	}
@@ -82,7 +82,7 @@ char *__uClibc_bindtextdomain(const char *domainname, const char *dirname)
 #if 1
 			&& ((dirname[0] != '/') || dirname[1])
 #else
-			&& strcmp(dirname, dir)
+			&& __strcmp(dirname, dir)
 #endif
 			)
 		) {
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index f46dabc2d..77d3f1e5d 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -155,7 +155,7 @@ char *setlocale(int category, register const char *locale)
 			 && ( (!locale)		/* Request for locale category string. */
 				  || (!*locale)	/* Implementation-defined default is C. */
 				  || ((*locale == 'C') && !locale[1])
-				  || (!strcmp(locale, "POSIX"))) )
+				  || (!__strcmp(locale, "POSIX"))) )
 		? (char *) C_string		/* Always in C/POSIX locale. */
 		: NULL;
 }
@@ -226,7 +226,7 @@ static void update_hr_locale(const unsigned char *spec)
 					*n = 0;
 				} else {
 					char at = 0;
-					memcpy(n, LOCALE_NAMES + 5*((*loc)-1), 5);
+					__memcpy(n, LOCALE_NAMES + 5*((*loc)-1), 5);
 					if (n[2] != '_') {
 						at = n[2];
 						n[2] = '_';
@@ -455,7 +455,7 @@ static int init_cur_collate(int der_num, __collate_t *cur_collate)
 								+ cdd->base_idx * sizeof(coldata_base_t)
 								)/2 );
 
-	memcpy(cur_collate, cdb, offsetof(coldata_base_t,index2weight_offset));
+	__memcpy(cur_collate, cdb, offsetof(coldata_base_t,index2weight_offset));
 	cur_collate->undefined_idx = cdd->undefined_idx;
 
 	cur_collate->ti_mask = (1 << cur_collate->ti_shift)-1;
@@ -507,9 +507,9 @@ static int init_cur_collate(int der_num, __collate_t *cur_collate)
 	cur_collate->index2ruleidx = cur_collate->index2weight
 		+ cur_collate->max_col_index + 1;
 
-	memcpy(cur_collate->index2weight, cur_collate->index2weight_tbl,
+	__memcpy(cur_collate->index2weight, cur_collate->index2weight_tbl,
 		   cur_collate->num_col_base * sizeof(uint16_t));
-	memcpy(cur_collate->index2ruleidx, cur_collate->index2ruleidx_tbl,
+	__memcpy(cur_collate->index2ruleidx, cur_collate->index2ruleidx_tbl,
 		   cur_collate->num_col_base * sizeof(uint16_t));
 
 	/* now do the overrides */
@@ -594,7 +594,7 @@ int _locale_set_l(const unsigned char *p, __locale_t base)
 			return 0;			/* calloc failed. */
 		}
 		free(base->collate.index2weight);
-		memcpy(&base->collate, &newcol, sizeof(__collate_t));
+		__memcpy(&base->collate, &newcol, sizeof(__collate_t));
 	}
 
 	do {
@@ -664,15 +664,15 @@ int _locale_set_l(const unsigned char *p, __locale_t base)
 					 * All of this will be replaced in the next generation
 					 * of locale support anyway... */
 
-					memcpy(base->__ctype_b_data,
+					__memcpy(base->__ctype_b_data,
 						   __C_ctype_b - __UCLIBC_CTYPE_B_TBL_OFFSET,
 						   (256 + __UCLIBC_CTYPE_B_TBL_OFFSET)
 						   * sizeof(__ctype_mask_t));
-					memcpy(base->__ctype_tolower_data,
+					__memcpy(base->__ctype_tolower_data,
 						   __C_ctype_tolower - __UCLIBC_CTYPE_TO_TBL_OFFSET,
 						   (256 + __UCLIBC_CTYPE_TO_TBL_OFFSET)
 						   * sizeof(__ctype_touplow_t));
-					memcpy(base->__ctype_toupper_data,
+					__memcpy(base->__ctype_toupper_data,
 						   __C_ctype_toupper - __UCLIBC_CTYPE_TO_TBL_OFFSET,
 						   (256 + __UCLIBC_CTYPE_TO_TBL_OFFSET)
 						   * sizeof(__ctype_touplow_t));
@@ -782,7 +782,7 @@ int _locale_set_l(const unsigned char *p, __locale_t base)
 				d = base->outdigit_length;
 				x = &base->outdigit0_mb;
 				for (c = 0 ; c < 10 ; c++) {
-					((unsigned char *)d)[c] = strlen(x[c]);
+					((unsigned char *)d)[c] = __strlen(x[c]);
 					assert(d[c] > 0);
 				}
 			} else if (i == LC_NUMERIC) {
@@ -847,10 +847,10 @@ static const uint16_t __code2flag[16] = {
 
 void _locale_init_l(__locale_t base)
 {
-	memset(base->cur_locale, 0, LOCALE_SELECTOR_SIZE);
+	__memset(base->cur_locale, 0, LOCALE_SELECTOR_SIZE);
 	base->cur_locale[0] = '#';
 
-	memcpy(base->category_item_count,
+	__memcpy(base->category_item_count,
 		   __locale_mmap->lc_common_item_offsets_LEN,
 		   LC_ALL);
 
@@ -1072,14 +1072,14 @@ static int find_locale(int category_mask, const char *p,
 	char buf[18];	/* TODO: 7+{max codeset name length} */
 	const char *q;
 
-	if ((q = strchr(p,'@')) != NULL) {
+	if ((q = __strchr(p,'@')) != NULL) {
 		if ((((size_t)((q-p)-5)) > (sizeof(buf) - 5)) || (p[2] != '_')) {
 			return 0;
 		}
 		/* locale name at least 5 chars long and 3rd char is '_' */
 		s = LOCALE_AT_MODIFIERS;
 		do {
-			if (!strcmp(s+2, q+1)) {
+			if (!__strcmp(s+2, q+1)) {
 				break;
 			}
 			s += 2 + *s;		/* TODO - fix this throughout */
@@ -1088,7 +1088,7 @@ static int find_locale(int category_mask, const char *p,
 			return 0;
 		}
 		assert(q - p < sizeof(buf));
-		memcpy(buf, p, q-p);
+		__memcpy(buf, p, q-p);
 		buf[q-p] = 0;
 		buf[2] = s[1];
 		p = buf;
@@ -1096,19 +1096,19 @@ static int find_locale(int category_mask, const char *p,
 #endif
 
 	lang_cult = codeset = 0;	/* Assume C and default codeset.  */
-	if (((*p == 'C') && !p[1]) || !strcmp(p, posix)) {
+	if (((*p == 'C') && !p[1]) || !__strcmp(p, posix)) {
 		goto FIND_LOCALE;
 	}
 
-	if ((strlen(p) > 5) && (p[5] == '.')) {	/* Codeset in locale name? */
+	if ((__strlen(p) > 5) && (p[5] == '.')) {	/* Codeset in locale name? */
 		/* TODO: maybe CODESET_LIST + *s ??? */
 		/* 7bit is 1, UTF-8 is 2, 8-bit is >= 3 */
 		codeset = 2;
-		if (strcmp(utf8,p+6) != 0) {/* TODO - fix! */
+		if (__strcmp(utf8,p+6) != 0) {/* TODO - fix! */
 			s = CODESET_LIST;
 			do {
 				++codeset;		/* Increment codeset first. */
-				if (!strcmp(CODESET_LIST+*s, p+6)) {
+				if (!__strcmp(CODESET_LIST+*s, p+6)) {
 					goto FIND_LANG_CULT;
 				}
 			} while (*++s);
@@ -1121,7 +1121,7 @@ static int find_locale(int category_mask, const char *p,
 	do {						/* TODO -- do a binary search? */
 		/* TODO -- fix gen_mmap!*/
 		++lang_cult;			/* Increment first since C/POSIX is 0. */
-		if (!strncmp(s,p,5)) { /* Found a matching locale name; */
+		if (!__strncmp(s,p,5)) { /* Found a matching locale name; */
 			goto FIND_LOCALE;
 		}
 		s += 5;
@@ -1163,14 +1163,14 @@ static unsigned char *composite_locale(int category_mask, const char *locale,
 	int c;
 	int component_mask;
 
-	if (!strchr(locale,'=')) {
+	if (!__strchr(locale,'=')) {
 		if (!find_locale(category_mask, locale, new_locale)) {
 			return NULL;
 		}
 		return new_locale;
 	}
 
-	if (strlen(locale) >= sizeof(buf)) {
+	if (__strlen(locale) >= sizeof(buf)) {
 		return NULL;
 	}
 	stpcpy(buf, locale);
@@ -1179,7 +1179,7 @@ static unsigned char *composite_locale(int category_mask, const char *locale,
 	t = strtok_r(buf, "=", &e);	/* This can't fail because of strchr test above. */
 	do {
 		c = 0;
-		while (strcmp(CATEGORY_NAMES + (int) CATEGORY_NAMES[c], t)) {
+		while (__strcmp(CATEGORY_NAMES + (int) CATEGORY_NAMES[c], t)) {
 			if (++c == LC_ALL) { /* Unknown category name! */
 				return NULL;
 			}
@@ -1221,7 +1221,7 @@ __locale_t __newlocale(int category_mask, const char *locale, __locale_t base)
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning TODO: Rename cur_locale to locale_selector.
 #endif
-	strcpy((char *) new_selector,
+	__strcpy((char *) new_selector,
 		   (base ? (char *) base->cur_locale : C_LOCALE_SELECTOR));
 
 	if (!*locale) {			 /* locale == "", so check environment. */
@@ -1310,9 +1310,9 @@ __locale_t __duplocale(__locale_t dataset)
 		if ((i2w = calloc(n, sizeof(uint16_t)))
 			!= NULL
 			) {
-			memcpy(r, dataset, sizeof(__uclibc_locale_t));
+			__memcpy(r, dataset, sizeof(__uclibc_locale_t));
 			r->collate.index2weight = i2w;
-			memcpy(i2w, dataset->collate.index2weight, n * sizeof(uint16_t));
+			__memcpy(i2w, dataset->collate.index2weight, n * sizeof(uint16_t));
 		} else {
 			free(r);
 			r = NULL;
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index 5e09af6d9..d367211c5 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -44,6 +44,15 @@ extern wctype_t __wctype (__const char *__property) attribute_hidden;
 
 extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/;
 #endif
+
+#define memcmp __memcmp
+#define memcpy __memcpy
+#define memmove __memmove
+#define memset __memset
+#define strchr __strchr
+#define strcmp __strcmp
+#define strlen __strlen
+#define strncpy __strncpy
 #endif
 
 /* Make sure noone compiles this code with a C++ compiler.  */
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index 3e9d2eb30..cdf2f940a 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -21,7 +21,6 @@
    02111-1307 USA.  */
 
 #define HAVE_MEMPCPY
-#define __mempcpy __libc_mempcpy
 #define memset __memset
 #define memcmp __memcmp
 #define strcmp __strcmp
@@ -40,8 +39,8 @@
 #define STDC_HEADERS
 #define RE_TRANSLATE_TYPE char *
 
-extern void *__libc_mempcpy (void *__restrict __dest,
-			__const void *__restrict __src, size_t __n) /*attribute_hidden*/;
+extern void *__mempcpy (void *__restrict __dest,
+			__const void *__restrict __src, size_t __n) attribute_hidden;
 
 /* AIX requires this to be the first thing in the file. */
 #if defined _AIX && !defined REGEX_MALLOC
diff --git a/libc/misc/search/hsearch_r.c b/libc/misc/search/hsearch_r.c
index 10efb1a88..0f96180b1 100644
--- a/libc/misc/search/hsearch_r.c
+++ b/libc/misc/search/hsearch_r.c
@@ -140,7 +140,7 @@ int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
 {
   unsigned int hval;
   unsigned int count;
-  unsigned int len = strlen (item.key);
+  unsigned int len = __strlen (item.key);
   unsigned int idx;
 
   /* Compute an value for the given string. Perhaps use a better method. */
@@ -166,7 +166,7 @@ int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
       unsigned hval2;
 
       if (htab->table[idx].used == hval
-	  && strcmp (item.key, htab->table[idx].entry.key) == 0)
+	  && __strcmp (item.key, htab->table[idx].entry.key) == 0)
 	{
 	  *retval = &htab->table[idx