summaryrefslogtreecommitdiff
path: root/libc/misc
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-12-04 01:08:42 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-12-04 01:08:42 +0000
commit765696aac59b7146777e4dfda0d8d35df0bb29e1 (patch)
treea1f2f8ce19de35f8030e8e388a3b962a2bff8cc7 /libc/misc
parent855dca36fe7aa348dc56996385fbbb77fbf3e83d (diff)
More hiding, 300 left
Diffstat (limited to 'libc/misc')
-rw-r--r--libc/misc/dirent/scandir.c2
-rw-r--r--libc/misc/dirent/scandir64.c2
-rw-r--r--libc/misc/ftw/ftw.c1
-rw-r--r--libc/misc/glob/glob.c1
-rw-r--r--libc/misc/internals/__uClibc_main.c2
-rw-r--r--libc/misc/ttyent/getttyent.c66
-rw-r--r--libc/misc/wordexp/wordexp.c2
7 files changed, 44 insertions, 32 deletions
diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c
index 8b08e4884..e80df58dc 100644
--- a/libc/misc/dirent/scandir.c
+++ b/libc/misc/dirent/scandir.c
@@ -20,6 +20,8 @@
/* Modified for uClibc by Erik Andersen
*/
+#define qsort __qsort
+
#include <dirent.h>
#include <stdio.h>
#include <string.h>
diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index 2916285eb..46b6d5cef 100644
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -20,6 +20,8 @@
/* Modified for uClibc by Erik Andersen
*/
+#define qsort __qsort
+
#include <features.h>
#ifdef __UCLIBC_HAS_LFS__
#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 58a9c3177..6bd36d749 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -25,6 +25,7 @@
#define stpcpy __stpcpy
#define tsearch __tsearch
#define tdestroy __tdestroy
+#define fchdir __fchdir
#define _GNU_SOURCE
#include <features.h>
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 22f1874ab..3fc20dbc2 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -17,6 +17,7 @@ Cambridge, MA 02139, USA. */
#define strrchr __strrchr
#define strcoll __strcoll
+#define qsort __qsort
#include <features.h>
#include <stdlib.h>
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index a46465398..618fad74c 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -14,7 +14,9 @@
*/
#define getgid __getgid
+#define getuid __getuid
#define getegid __getegid
+#define geteuid __geteuid
#define _ERRNO_H
#include <features.h>
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index 923c45ab0..04f511921 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -46,19 +46,6 @@ static FILE *tf;
static struct ttyent tty;
-struct ttyent * getttynam(const char *tty)
-{
- register struct ttyent *t;
-
- setttyent();
- while ((t = getttyent()))
- if (!__strcmp(tty, t->ty_name))
- break;
- endttyent();
- return (t);
-}
-
-
/* Skip over the current field, removing quotes, and return
* a pointer to the next field.
*/
@@ -101,13 +88,30 @@ static char * value(register char *p)
return ((p = __strchr(p, '=')) ? ++p : NULL);
}
-struct ttyent * getttyent(void)
+int attribute_hidden __setttyent(void)
+{
+
+ if (tf) {
+ rewind(tf);
+ return (1);
+ } else if ((tf = fopen(_PATH_TTYS, "r"))) {
+ /* We do the locking ourselves. */
+#ifdef __UCLIBC_HAS_THREADS__
+ __fsetlocking (tf, FSETLOCKING_BYCALLER);
+#endif
+ return (1);
+ }
+ return (0);
+}
+strong_alias(__setttyent,setttyent)
+
+struct ttyent attribute_hidden * __getttyent(void)
{
register int c;
register char *p;
static char *line = NULL;
- if (!tf && !setttyent())
+ if (!tf && !__setttyent())
return (NULL);
if (!line) {
@@ -177,24 +181,9 @@ struct ttyent * getttyent(void)
*p = '\0';
return (&tty);
}
+strong_alias(__getttyent,getttyent)
-int setttyent(void)
-{
-
- if (tf) {
- rewind(tf);
- return (1);
- } else if ((tf = fopen(_PATH_TTYS, "r"))) {
- /* We do the locking ourselves. */
-#ifdef __UCLIBC_HAS_THREADS__
- __fsetlocking (tf, FSETLOCKING_BYCALLER);
-#endif
- return (1);
- }
- return (0);
-}
-
-int endttyent(void)
+int attribute_hidden __endttyent(void)
{
int rval;
@@ -205,3 +194,16 @@ int endttyent(void)
}
return (1);
}
+strong_alias(__endttyent,endttyent)
+
+struct ttyent * getttynam(const char *tty)
+{
+ register struct ttyent *t;
+
+ __setttyent();
+ while ((t = __getttyent()))
+ if (!__strcmp(tty, t->ty_name))
+ break;
+ __endttyent();
+ return (t);
+}
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index ea69bc684..9cdeaf162 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -26,6 +26,8 @@
#define unsetenv __unsetenv
#define waitpid __waitpid
#define kill __kill
+#define getuid __getuid
+#define execve __execve
#define _GNU_SOURCE
#include <sys/cdefs.h>