diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-08 04:31:05 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-08 04:31:05 +0000 |
| commit | c5ad60615407d6f54807ed52656d962d1dcbbe3e (patch) | |
| tree | 5ef0a9f39d02d46f8b8f4895e2deada7a1b72340 /libc/stdlib | |
| parent | dc92cc5ad2d89036502585cf05426012b1f8647e (diff) | |
| download | uClibc-alpine-c5ad60615407d6f54807ed52656d962d1dcbbe3e.tar.bz2 uClibc-alpine-c5ad60615407d6f54807ed52656d962d1dcbbe3e.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib')
| -rw-r--r-- | libc/stdlib/ptsname.c | 5 | ||||
| -rw-r--r-- | libc/stdlib/realpath.c | 3 | ||||
| -rw-r--r-- | libc/stdlib/stdlib.c | 1 | ||||
| -rw-r--r-- | libc/stdlib/unix_grantpt.c | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c index d4e99a035..8cac95783 100644 --- a/libc/stdlib/ptsname.c +++ b/libc/stdlib/ptsname.c @@ -62,7 +62,7 @@ extern const char _ptyname2[]; /* Store at most BUFLEN characters of the pathname of the slave pseudo terminal associated with the master FD is open on in BUF. Return 0 on success, otherwise an error number. */ -int ptsname_r (int fd, char *buf, size_t buflen) +int attribute_hidden __ptsname_r (int fd, char *buf, size_t buflen) { int save_errno = errno; #if !defined __UNIX98PTY_ONLY__ @@ -179,6 +179,7 @@ int ptsname_r (int fd, char *buf, size_t buflen) errno = save_errno; return 0; } +strong_alias(__ptsname_r,ptsname_r) /* Return the pathname of the pseudo terminal slave assoicated with the master FD is open on, or NULL on errors. @@ -188,5 +189,5 @@ ptsname (int fd) { static char buffer[sizeof (_PATH_DEVPTS) + 20]; - return ptsname_r (fd, buffer, sizeof (buffer)) != 0 ? NULL : buffer; + return __ptsname_r (fd, buffer, sizeof (buffer)) != 0 ? NULL : buffer; } diff --git a/libc/stdlib/realpath.c b/libc/stdlib/realpath.c index 7266ba4c6..88677f7a7 100644 --- a/libc/stdlib/realpath.c +++ b/libc/stdlib/realpath.c @@ -13,6 +13,9 @@ * GNU Library Public License for more details. */ +#define readlink __readlink +#define getcwd __getcwd + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index 04c85d32f..09524d013 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -36,6 +36,7 @@ #define mbsrtowcs __mbsrtowcs #define mbrtowc __mbrtowc #define mbrlen __mbrlen +#define wcrtomb __wcrtomb #define _ISOC99_SOURCE /* for ULLONG primarily... */ #define _GNU_SOURCE diff --git a/libc/stdlib/unix_grantpt.c b/libc/stdlib/unix_grantpt.c index 1f1c4df5c..e087d18c8 100644 --- a/libc/stdlib/unix_grantpt.c +++ b/libc/stdlib/unix_grantpt.c @@ -22,6 +22,7 @@ #define getuid __getuid #define setrlimit __setrlimit #define waitpid __waitpid +#define dup2 __dup2 #include <assert.h> #include <errno.h> @@ -43,7 +44,7 @@ #define vfork fork #endif -extern int ptsname_r (int fd, char *buf, size_t buflen); +extern int __ptsname_r (int fd, char *buf, size_t buflen) attribute_hidden; /* Return the result of ptsname_r in the buffer pointed to by PTS, which should be of length BUF_LEN. If it is too long to fit in @@ -61,7 +62,7 @@ pts_name (int fd, char **pts, size_t buf_len) if (buf_len) { - rv = ptsname_r (fd, buf, buf_len); + rv = __ptsname_r (fd, buf, buf_len); if (rv != 0 || memchr (buf, '\0', buf_len)) /* We either got an error, or we succeeded and the |