diff options
author | Peter S. Mazinger <ps.m@gmx.net> | 2005-12-03 00:34:49 +0000 |
---|---|---|
committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-12-03 00:34:49 +0000 |
commit | c885bf5cf94a12202f849477a845d728cbd12889 (patch) | |
tree | 106e36d57ea684166ebde05a8d4be54664e0e6ce /libc/misc/wordexp | |
parent | ca3067b8cec6e7ffd600c92510197df5aedd8606 (diff) |
More hiding, including __mempcpy
Diffstat (limited to 'libc/misc/wordexp')
-rw-r--r-- | libc/misc/wordexp/wordexp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index 5e9133c83..ea69bc684 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -20,9 +20,12 @@ Boston, MA 02111-1307, USA. */ #define mempcpy __mempcpy +#define stpcpy __stpcpy #define strndup __strndup #define strspn __strspn #define unsetenv __unsetenv +#define waitpid __waitpid +#define kill __kill #define _GNU_SOURCE #include <sys/cdefs.h> @@ -283,7 +286,7 @@ parse_tilde(char **word, size_t * word_length, size_t * max_length, results are unspecified. We do a lookup on the uid if HOME is unset. */ - home = getenv("HOME"); + home = __getenv("HOME"); if (home != NULL) { *word = w_addstr(*word, word_length, max_length, home); if (*word == NULL) @@ -1328,7 +1331,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, /* Is it `$$'? */ if (*env == '$') { buffer[20] = '\0'; - value = _itoa(getpid(), &buffer[20]); + value = _itoa(__getpid(), &buffer[20]); } /* Is it `${#*}' or `${#@}'? */ else if ((*env == '*' || *env == '@') && seen_hash) { @@ -1395,7 +1398,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, } } } else - value = getenv(env); + value = __getenv(env); if (value == NULL && (flags & WRDE_UNDEF)) { /* Variable not defined. */ @@ -2067,7 +2070,7 @@ int wordexp(const char *words, wordexp_t * we, int flags) /* Find out what the field separators are. * There are two types: whitespace and non-whitespace. */ - ifs = getenv("IFS"); + ifs = __getenv("IFS"); if (!ifs) /* IFS unset - use <space><tab><newline>. */ |