aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-16 11:44:36 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-16 11:44:36 +0000
commit50304ef0572fb41ba853262046dc7594f6a15241 (patch)
tree7bd5691f3d9acc632bdfcd61379cef9aeeb5b84b /sysdeps/posix
parente31cac9420203a4e01327eaffe1cc27f15463afb (diff)
downloadglibc-50304ef0572fb41ba853262046dc7594f6a15241.tar
glibc-50304ef0572fb41ba853262046dc7594f6a15241.tar.gz
glibc-50304ef0572fb41ba853262046dc7594f6a15241.tar.bz2
glibc-50304ef0572fb41ba853262046dc7594f6a15241.zip
Update.
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
Diffstat (limited to 'sysdeps/posix')
-rw-r--r--sysdeps/posix/cuserid.c4
-rw-r--r--sysdeps/posix/euidaccess.c8
-rw-r--r--sysdeps/posix/mkstemp.c4
-rw-r--r--sysdeps/posix/mktemp.c2
-rw-r--r--sysdeps/posix/pread.c10
-rw-r--r--sysdeps/posix/pread64.c10
-rw-r--r--sysdeps/posix/profil.c6
-rw-r--r--sysdeps/posix/pwrite.c10
-rw-r--r--sysdeps/posix/pwrite64.c10
-rw-r--r--sysdeps/posix/sigblock.c4
-rw-r--r--sysdeps/posix/sigpause.c6
-rw-r--r--sysdeps/posix/ttyname.c10
-rw-r--r--sysdeps/posix/ttyname_r.c10
-rw-r--r--sysdeps/posix/waitid.c2
14 files changed, 48 insertions, 48 deletions
diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c
index 3108a46c21..68de92ae64 100644
--- a/sysdeps/posix/cuserid.c
+++ b/sysdeps/posix/cuserid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ cuserid (s)
struct passwd pwent;
struct passwd *pwptr;
- if (__getpwuid_r (geteuid (), &pwent, buf, sizeof (buf), &pwptr))
+ if (__getpwuid_r (__geteuid (), &pwent, buf, sizeof (buf), &pwptr))
{
if (s != NULL)
s[0] = '\0';
diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c
index ed59582154..d38e7cc71b 100644
--- a/sysdeps/posix/euidaccess.c
+++ b/sysdeps/posix/euidaccess.c
@@ -1,5 +1,5 @@
/* Check if effective user id can access file
- Copyright (C) 1990, 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1990, 91, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -139,7 +139,7 @@ euidaccess (path, mode)
#ifdef _LIBC
if (! __libc_enable_secure)
/* If we are not set-uid or set-gid, access does the same. */
- return access (path, mode);
+ return __access (path, mode);
#else
if (have_ids == 0)
{
@@ -171,8 +171,8 @@ euidaccess (path, mode)
if (have_ids == 0)
{
have_ids = 1;
- euid = geteuid ();
- egid = getegid ();
+ euid = __geteuid ();
+ egid = __getegid ();
}
#endif
diff --git a/sysdeps/posix/mkstemp.c b/sysdeps/posix/mkstemp.c
index 2c9c96bdcc..d380935c42 100644
--- a/sysdeps/posix/mkstemp.c
+++ b/sysdeps/posix/mkstemp.c
@@ -53,7 +53,7 @@ mkstemp (template)
/* Get some more or less random data. */
__gettimeofday (&tv, NULL);
- value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+ value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ __getpid ();
for (count = 0; count < TMP_MAX; ++count)
{
@@ -73,7 +73,7 @@ mkstemp (template)
v /= 62;
XXXXXX[5] = letters[v % 62];
- fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600);
+ fd = __open (template, O_RDWR|O_CREAT|O_EXCL, 0600);
if (fd >= 0)
/* The file does not exist. */
return fd;
diff --git a/sysdeps/posix/mktemp.c b/sysdeps/posix/mktemp.c
index ad5cb1daf5..e9a576c16f 100644
--- a/sysdeps/posix/mktemp.c
+++ b/sysdeps/posix/mktemp.c
@@ -53,7 +53,7 @@ mktemp (template)
/* Get some more or less random data. */
__gettimeofday (&tv, NULL);
- value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+ value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ __getpid ();
for (count = 0; count < TMP_MAX; ++count)
{
diff --git a/sysdeps/posix/pread.c b/sysdeps/posix/pread.c
index 22b8ca82bd..5ad5acbd2a 100644
--- a/sysdeps/posix/pread.c
+++ b/sysdeps/posix/pread.c
@@ -1,6 +1,6 @@
/* Read block from given position in file without changing file pointer.
POSIX version.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,22 +29,22 @@ __pread (int fd, void *buf, size_t nbyte, off_t offset)
we can restore it later. */
int save_errno;
ssize_t result;
- off_t old_offset = lseek (fd, 0, SEEK_CUR);
+ off_t old_offset = __lseek (fd, 0, SEEK_CUR);
if (old_offset == (off_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek (fd, offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, offset, SEEK_SET) == (off_t) -1)
return -1;
/* Write out the data. */
- result = read (fd, buf, nbyte);
+ result = __read (fd, buf, nbyte);
/* Now we have to restore the position. If this fails we have to
return this as an error. But if the writing also failed we
return this error. */
save_errno = errno;
- if (lseek (fd, old_offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, old_offset, SEEK_SET) == (off_t) -1)
{
if (result == -1)
__set_errno (save_errno);
diff --git a/sysdeps/posix/pread64.c b/sysdeps/posix/pread64.c
index 00b1f33bf2..16fb3df142 100644
--- a/sysdeps/posix/pread64.c
+++ b/sysdeps/posix/pread64.c
@@ -1,6 +1,6 @@
/* Read block from given position in file without changing file pointer.
POSIX version.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,22 +29,22 @@ __pread64 (int fd, void *buf, size_t nbyte, off64_t offset)
we can restore it later. */
int save_errno;
ssize_t result;
- off64_t old_offset = lseek64 (fd, 0, SEEK_CUR);
+ off64_t old_offset = __lseek64 (fd, 0, SEEK_CUR);
if (old_offset == (off64_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek64 (fd, offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64 (fd, offset, SEEK_SET) == (off64_t) -1)
return -1;
/* Write out the data. */
- result = read (fd, buf, nbyte);
+ result = __read (fd, buf, nbyte);
/* Now we have to restore the position. If this fails we have to
return this as an error. But if the writing also failed we
return this error. */
save_errno = errno;
- if (lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1)
{
if (result == -1)
__set_errno (save_errno);
diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c
index 30481465fb..beb5ae47cd 100644
--- a/sysdeps/posix/profil.c
+++ b/sysdeps/posix/profil.c
@@ -74,7 +74,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
/* Wasn't turned on. */
return 0;
- if (setitimer (ITIMER_PROF, &otimer, NULL) < 0)
+ if (__setitimer (ITIMER_PROF, &otimer, NULL) < 0)
return -1;
samples = NULL;
return sigaction (SIGPROF, &oact, NULL);
@@ -84,7 +84,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
{
/* Was already turned on. Restore old timer and signal handler
first. */
- if (setitimer (ITIMER_PROF, &otimer, NULL) < 0
+ if (__setitimer (ITIMER_PROF, &otimer, NULL) < 0
|| sigaction (SIGPROF, &oact, NULL) < 0)
return -1;
}
@@ -103,7 +103,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
timer.it_value.tv_sec = 0;
timer.it_value.tv_usec = 1;
timer.it_interval = timer.it_value;
- return setitimer (ITIMER_PROF, &timer, &otimer);
+ return __setitimer (ITIMER_PROF, &timer, &otimer);
}
weak_alias (__profil, profil)
diff --git a/sysdeps/posix/pwrite.c b/sysdeps/posix/pwrite.c
index ef4a021881..6558eb5c9d 100644
--- a/sysdeps/posix/pwrite.c
+++ b/sysdeps/posix/pwrite.c
@@ -1,6 +1,6 @@
/* Write block to given position in file without changing file pointer.
POSIX version.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,22 +29,22 @@ __pwrite (int fd, const void *buf, size_t nbyte, off_t offset)
we can restore it later. */
int save_errno;
ssize_t result;
- off_t old_offset = lseek (fd, 0, SEEK_CUR);
+ off_t old_offset = __lseek (fd, 0, SEEK_CUR);
if (old_offset == (off_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek (fd, offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, offset, SEEK_SET) == (off_t) -1)
return -1;
/* Write out the data. */
- result = write (fd, buf, nbyte);
+ result = __write (fd, buf, nbyte);
/* Now we have to restore the position. If this fails we have to
return this as an error. But if the writing also failed we
return this error. */
save_errno = errno;
- if (lseek (fd, old_offset, SEEK_SET) == (off_t) -1)
+ if (__lseek (fd, old_offset, SEEK_SET) == (off_t) -1)
{
if (result == -1)
__set_errno (save_errno);
diff --git a/sysdeps/posix/pwrite64.c b/sysdeps/posix/pwrite64.c
index 4045ed4344..89ec261b76 100644
--- a/sysdeps/posix/pwrite64.c
+++ b/sysdeps/posix/pwrite64.c
@@ -1,6 +1,6 @@
/* Write block to given position in file without changing file pointer.
POSIX version.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,22 +29,22 @@ __pwrite64 (int fd, const void *buf, size_t nbyte, off64_t offset)
we can restore it later. */
int save_errno;
ssize_t result;
- off64_t old_offset = lseek64 (fd, 0, SEEK_CUR);
+ off64_t old_offset = __lseek64 (fd, 0, SEEK_CUR);
if (old_offset == (off64_t) -1)
return -1;
/* Set to wanted position. */
- if (lseek64 (fd, offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64 (fd, offset, SEEK_SET) == (off64_t) -1)
return -1;
/* Write out the data. */
- result = write (fd, buf, nbyte);
+ result = __write (fd, buf, nbyte);
/* Now we have to restore the position. If this fails we have to
return this as an error. But if the writing also failed we
return this error. */
save_errno = errno;
- if (lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1)
+ if (__lseek64 (fd, old_offset, SEEK_SET) == (off64_t) -1)
{
if (result == -1)
__set_errno (save_errno);
diff --git a/sysdeps/posix/sigblock.c b/sysdeps/posix/sigblock.c
index efc559dcbc..b652cf7c31 100644
--- a/sysdeps/posix/sigblock.c
+++ b/sysdeps/posix/sigblock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@ __sigblock (mask)
if ((mask & sigmask (sig)) && __sigaddset (&set, sig) < 0)
return -1;
- if (sigprocmask (SIG_BLOCK, &set, &oset) < 0)
+ if (__sigprocmask (SIG_BLOCK, &set, &oset) < 0)
return -1;
if (sizeof (mask) == sizeof (oset))
diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index d954125ee4..eced47e42a 100644
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ __sigpause (sig_or_mask, is_sig)
if (is_sig != 0)
{
/* The modern X/Open implementation is requested. */
- if (sigprocmask (0, NULL, &set) < 0
+ if (__sigprocmask (0, NULL, &set) < 0
/* Yes, we call `sigdelset' and not `__sigdelset'. */
|| sigdelset (&set, sig_or_mask) < 0)
return -1;
@@ -53,7 +53,7 @@ __sigpause (sig_or_mask, is_sig)
return -1;
}
- return sigsuspend (&set);
+ return __sigsuspend (&set);
}
diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c
index 5ad45ae2a6..a865ded9f5 100644
--- a/sysdeps/posix/ttyname.c
+++ b/sysdeps/posix/ttyname.c
@@ -47,14 +47,14 @@ getttyname (fd, mydev, myino, save, dostat)
DIR *dirstream;
struct dirent *d;
- dirstream = opendir (dev);
+ dirstream = __opendir (dev);
if (dirstream == NULL)
{
*dostat = -1;
return NULL;
}
- while ((d = readdir (dirstream)) != NULL)
+ while ((d = __readdir (dirstream)) != NULL)
if (((ino_t) d->d_fileno == myino || *dostat)
&& strcmp (d->d_name, "stdin")
&& strcmp (d->d_name, "stdout")
@@ -70,7 +70,7 @@ getttyname (fd, mydev, myino, save, dostat)
{
*dostat = -1;
/* Perhaps it helps to free the directory stream buffer. */
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
return NULL;
}
*((char *) __mempcpy (name, dev, sizeof (dev) - 1)) = '/';
@@ -84,14 +84,14 @@ getttyname (fd, mydev, myino, save, dostat)
#endif
)
{
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
__ttyname = name;
__set_errno (save);
return name;
}
}
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
__set_errno (save);
return NULL;
}
diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c
index ae427f1aef..d4c6e0468a 100644
--- a/sysdeps/posix/ttyname_r.c
+++ b/sysdeps/posix/ttyname_r.c
@@ -51,14 +51,14 @@ getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
DIR *dirstream;
struct dirent *d;
- dirstream = opendir (dev);
+ dirstream = __opendir (dev);
if (dirstream == NULL)
{
*dostat = -1;
return errno;
}
- while ((d = readdir (dirstream)) != NULL)
+ while ((d = __readdir (dirstream)) != NULL)
if (((ino_t) d->d_fileno == myino || *dostat)
&& strcmp (d->d_name, "stdin")
&& strcmp (d->d_name, "stdout")
@@ -70,7 +70,7 @@ getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
if (needed > buflen)
{
*dostat = -1;
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
__set_errno (ERANGE);
return ERANGE;
}
@@ -86,13 +86,13 @@ getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
#endif
)
{
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
__set_errno (save);
return 0;
}
}
- (void) closedir (dirstream);
+ (void) __closedir (dirstream);
__set_errno (save);
/* It is not clear what to return in this case. `isatty' says FD
refers to a TTY but no entry in /dev has this inode. */
diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c
index fa9021115f..7bb3bbeb47 100644
--- a/sysdeps/posix/waitid.c
+++ b/sysdeps/posix/waitid.c
@@ -69,7 +69,7 @@ waitid (idtype, id, infop, options)
return -1;
}
- child = waitpid (pid, &status, options);
+ child = __waitpid (pid, &status, options);
if (child == -1)
/* `waitpid' set `errno' for us. */