diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-09 16:47:01 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-09 16:47:01 +0000 |
| commit | 62a21af8006ab04282fdc354c5b4dc765f56d058 (patch) | |
| tree | 568761d58289238aa14cced3f0010809d4d28c00 /libutil | |
| parent | ef250238dc1572caf859c2b64652f9cdfb0d9e42 (diff) | |
| download | uClibc-alpine-62a21af8006ab04282fdc354c5b4dc765f56d058.tar.bz2 uClibc-alpine-62a21af8006ab04282fdc354c5b4dc765f56d058.tar.xz | |
BIG BIG commit: all left files merged from trunk [rev 22714]. Currenntly NPTL sh4 port build and work fine. All committed to allow Khem Ray working on a working branch to integrate the ARM nptl port. MIPS nptl port not tested but should still building and working fine. There are some other part non yet merged with trunk (misc/internals and some headers file that need some more work). Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libutil')
| -rw-r--r-- | libutil/forkpty.c | 6 | ||||
| -rw-r--r-- | libutil/logout.c | 2 | ||||
| -rw-r--r-- | libutil/logwtmp.c | 2 | ||||
| -rw-r--r-- | libutil/openpty.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/libutil/forkpty.c b/libutil/forkpty.c index 572c22200..61e85929a 100644 --- a/libutil/forkpty.c +++ b/libutil/forkpty.c @@ -27,11 +27,7 @@ libutil_hidden_proto(openpty) libutil_hidden_proto(login_tty) int -forkpty (amaster, name, termp, winp) - int *amaster; - char *name; - struct termios *termp; - struct winsize *winp; +forkpty (int *amaster, char *name, struct termios *termp, struct winsize *winp) { int master, slave, pid; diff --git a/libutil/logout.c b/libutil/logout.c index 08094d41d..e6d9565ab 100644 --- a/libutil/logout.c +++ b/libutil/logout.c @@ -51,7 +51,7 @@ logout (const char *line) memset (ut->ut_host, 0, sizeof ut->ut_host); #endif #if _HAVE_UT_TV - 0 -# if __WORDSIZE_COMPAT32 == 0 +# if !defined __WORDSIZE_COMPAT32 || __WORDSIZE_COMPAT32 == 0 gettimeofday (&ut->ut_tv, NULL); # else { diff --git a/libutil/logwtmp.c b/libutil/logwtmp.c index 85b770c18..0845b5038 100644 --- a/libutil/logwtmp.c +++ b/libutil/logwtmp.c @@ -24,7 +24,7 @@ void logwtmp (const char *line, const char *name, const char *host) strncpy(lutmp.ut_line, line, sizeof(lutmp.ut_line)-1); strncpy(lutmp.ut_name, name, sizeof(lutmp.ut_name)-1); strncpy(lutmp.ut_host, host, sizeof(lutmp.ut_host)-1); -#if __WORDSIZE_COMPAT32 == 0 +#if !defined __WORDSIZE_COMPAT32 || __WORDSIZE_COMPAT32 == 0 gettimeofday(&(lutmp.ut_tv), NULL); #else { diff --git a/libutil/openpty.c b/libutil/openpty.c index 9a65e56b1..5f58476e9 100644 --- a/libutil/openpty.c +++ b/libutil/openpty.c @@ -106,7 +106,7 @@ openpty (int *amaster, int *aslave, char *name, struct termios *termp, #endif int master, slave; - master = getpt (); + master = posix_openpt (O_RDWR); if (master == -1) return -1; |