From 50304ef0572fb41ba853262046dc7594f6a15241 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 16 Jul 1998 11:44:36 +0000 Subject: Update. 1998-07-16 10:23 Ulrich Drepper * 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 * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey . --- sysdeps/unix/getlogin_r.c | 6 ++-- sysdeps/unix/grantpt.c | 10 +++---- sysdeps/unix/rewinddir.c | 4 +-- sysdeps/unix/sysv/linux/accept.S | 1 - sysdeps/unix/sysv/linux/bind.S | 1 + sysdeps/unix/sysv/linux/gethostid.c | 4 +-- sysdeps/unix/sysv/linux/getpt.c | 4 +-- sysdeps/unix/sysv/linux/getsockname.S | 1 + sysdeps/unix/sysv/linux/i386/socket.S | 6 ++++ sysdeps/unix/sysv/linux/if_index.c | 40 ++++++++++++------------- sysdeps/unix/sysv/linux/listen.S | 1 + sysdeps/unix/sysv/linux/ptsname.c | 2 +- sysdeps/unix/sysv/linux/recvfrom.S | 1 - sysdeps/unix/sysv/linux/sendmsg.c | 6 ++-- sysdeps/unix/sysv/linux/sendto.S | 1 - sysdeps/unix/sysv/linux/setsockopt.S | 1 + sysdeps/unix/sysv/linux/statvfs.c | 4 +-- sysdeps/unix/sysv/linux/ttyname.c | 6 ++-- sysdeps/unix/sysv/linux/ttyname_r.c | 10 +++---- sysdeps/unix/sysv/linux/ulimit.c | 4 +-- sysdeps/unix/sysv/linux/unlockpt.c | 2 +- sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h | 4 ++- 22 files changed, 64 insertions(+), 55 deletions(-) (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/getlogin_r.c b/sysdeps/unix/getlogin_r.c index 8ec2fae754..cb0545e08a 100644 --- a/sysdeps/unix/getlogin_r.c +++ b/sysdeps/unix/getlogin_r.c @@ -1,5 +1,5 @@ /* Reentrant function to return the current login name. Unix version. - Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 1992, 1996, 1997, 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 @@ -45,8 +45,8 @@ getlogin_r (name, name_len) if (d < 0) return errno; - result = ttyname_r (d, real_tty_path, sizeof (tty_pathname)); - (void) close (d); + result = __ttyname_r (d, real_tty_path, sizeof (tty_pathname)); + (void) __close (d); if (result != 0) { diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c index 24f0e17792..5d33a515f1 100644 --- a/sysdeps/unix/grantpt.c +++ b/sysdeps/unix/grantpt.c @@ -52,12 +52,12 @@ grantpt (fd) if (__xstat (_STAT_VER, namebuf, &st) != 0) return -1; - if (st.st_uid == getuid ()) + if (st.st_uid == __getuid ()) return 0; /* We have to do it in user space. */ - pid = fork (); + pid = __fork (); if (pid == -1) return -1; else if (pid == 0) @@ -68,15 +68,15 @@ grantpt (fd) /* The helper does its thing on fd PTY_FD. */ if (fd != PTY_FD) - if (dup2 (fd, PTY_FD) == -1) + if (__dup2 (fd, PTY_FD) == -1) _exit (FAIL_EBADF); - execve (helper, (char *const *) argv, 0); + __execve (helper, (char *const *) argv, 0); _exit (FAIL_EXEC); } else { - if (waitpid (pid, &w, 0) == -1) + if (__waitpid (pid, &w, 0) == -1) return -1; if (!WIFEXITED (w)) { diff --git a/sysdeps/unix/rewinddir.c b/sysdeps/unix/rewinddir.c index 07be1c6543..ded449410f 100644 --- a/sysdeps/unix/rewinddir.c +++ b/sysdeps/unix/rewinddir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 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 @@ -29,7 +29,7 @@ rewinddir (dirp) DIR *dirp; { __libc_lock_lock (dirp->lock); - (void) lseek (dirp->fd, (off_t) 0, SEEK_SET); + (void) __lseek (dirp->fd, (off_t) 0, SEEK_SET); dirp->offset = 0; dirp->size = 0; __libc_lock_unlock (dirp->lock); diff --git a/sysdeps/unix/sysv/linux/accept.S b/sysdeps/unix/sysv/linux/accept.S index 196634d46a..431dec0324 100644 --- a/sysdeps/unix/sysv/linux/accept.S +++ b/sysdeps/unix/sysv/linux/accept.S @@ -2,4 +2,3 @@ #define __socket __libc_accept #define NARGS 3 #include -weak_alias (__libc_accept, __accept) diff --git a/sysdeps/unix/sysv/linux/bind.S b/sysdeps/unix/sysv/linux/bind.S index 61fb5ebff8..25ff7ecbfd 100644 --- a/sysdeps/unix/sysv/linux/bind.S +++ b/sysdeps/unix/sysv/linux/bind.S @@ -1,3 +1,4 @@ #define socket bind #define NARGS 3 +#define NO_WEAK_ALIAS 1 #include diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index 67e64208b3..f8a3b80481 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -81,7 +81,7 @@ gethostid () /* Getting from the file was not successful. An intelligent guess for a unique number of a host is its IP address. Return this. */ - if (gethostname (hostname, MAXHOSTNAMELEN) < 0 || hostname[0] == '\0') + if (__gethostname (hostname, MAXHOSTNAMELEN) < 0 || hostname[0] == '\0') /* This also fails. Return and arbitrary value. */ return 0; diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c index 3c0b7a9399..0f5949d1bc 100644 --- a/sysdeps/unix/sysv/linux/getpt.c +++ b/sysdeps/unix/sysv/linux/getpt.c @@ -43,7 +43,7 @@ __getpt () /* The new way: */ if (have_dev_ptmx) { - fd = open ("/dev/ptmx", O_RDWR); + fd = __open ("/dev/ptmx", O_RDWR); if (fd != -1) return fd; else @@ -64,7 +64,7 @@ __getpt () for (j = __ptyname2; *j; ++j) { namebuf[9] = *j; - fd = open (namebuf, O_RDWR); + fd = __open (namebuf, O_RDWR); if (fd != -1) return fd; if (errno != EIO) diff --git a/sysdeps/unix/sysv/linux/getsockname.S b/sysdeps/unix/sysv/linux/getsockname.S index c138be9da5..31d37a4f0a 100644 --- a/sysdeps/unix/sysv/linux/getsockname.S +++ b/sysdeps/unix/sysv/linux/getsockname.S @@ -1,3 +1,4 @@ #define socket getsockname #define NARGS 3 +#define NO_WEAK_ALIAS 1 #include diff --git a/sysdeps/unix/sysv/linux/i386/socket.S b/sysdeps/unix/sysv/linux/i386/socket.S index 245d37a17f..c25b5b82cc 100644 --- a/sysdeps/unix/sysv/linux/i386/socket.S +++ b/sysdeps/unix/sysv/linux/i386/socket.S @@ -32,7 +32,11 @@ The .S files for the other calls just #define socket and #include this. */ #ifndef __socket +#ifndef NO_WEAK_ALIAS #define __socket P(__,socket) +#else +#define __socket socket +#endif #endif .globl __socket @@ -63,4 +67,6 @@ L(pseudo_end): PSEUDO_END (__socket) +#ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) +#endif diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index de66b5cb21..aa89a38e69 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -40,7 +40,7 @@ opensock (void) if (sock_af != -1) { - fd = socket (sock_af, SOCK_DGRAM, 0); + fd = __socket (sock_af, SOCK_DGRAM, 0); if (fd != -1) return fd; } @@ -48,19 +48,19 @@ opensock (void) __libc_lock_lock (lock); if (sock_af != -1) - fd = socket (sock_af, SOCK_DGRAM, 0); + fd = __socket (sock_af, SOCK_DGRAM, 0); if (fd == -1) { - fd = socket (sock_af = AF_INET6, SOCK_DGRAM, 0); + fd = __socket (sock_af = AF_INET6, SOCK_DGRAM, 0); if (fd < 0) - fd = socket (sock_af = AF_INET, SOCK_DGRAM, 0); + fd = __socket (sock_af = AF_INET, SOCK_DGRAM, 0); if (fd < 0) - fd = socket (sock_af = AF_IPX, SOCK_DGRAM, 0); + fd = __socket (sock_af = AF_IPX, SOCK_DGRAM, 0); if (fd < 0) - fd = socket (sock_af = AF_AX25, SOCK_DGRAM, 0); + fd = __socket (sock_af = AF_AX25, SOCK_DGRAM, 0); if (fd < 0) - fd = socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0); + fd = __socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0); } __libc_lock_unlock (lock); @@ -82,15 +82,15 @@ if_nametoindex (const char *ifname) return 0; strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl (fd, SIOGIFINDEX, &ifr) < 0) + if (__ioctl (fd, SIOGIFINDEX, &ifr) < 0) { int saved_errno = errno; - close (fd); + __close (fd); if (saved_errno == EINVAL) __set_errno (ENOSYS); return 0; } - close (fd); + __close (fd); return ifr.ifr_ifindex; #endif } @@ -134,7 +134,7 @@ if_nameindex (void) { ifc.ifc_buf = NULL; ifc.ifc_len = 0; - if (ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0) + if (__ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0) { new_siocgifconf = 0; rq_len = RQ_IFS * sizeof (struct ifreq); @@ -149,9 +149,9 @@ if_nameindex (void) do { ifc.ifc_buf = alloca (ifc.ifc_len = rq_len); - if ((ifc.ifc_buf == NULL) || (ioctl (fd, SIOCGIFCONF, &ifc) < 0)) + if (ifc.ifc_buf == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) { - close (fd); + __close (fd); return NULL; } rq_len *= 2; @@ -163,7 +163,7 @@ if_nameindex (void) idx = malloc ((nifs + 1) * sizeof (struct if_nameindex)); if (idx == NULL) { - close (fd); + __close (fd); return NULL; } @@ -172,7 +172,7 @@ if_nameindex (void) struct ifreq *ifr = &ifc.ifc_req[i]; idx[i].if_name = __strdup (ifr->ifr_name); if (idx[i].if_name == NULL - || ioctl (fd, SIOGIFINDEX, ifr) < 0) + || __ioctl (fd, SIOGIFINDEX, ifr) < 0) { int saved_errno = errno; unsigned int j; @@ -180,7 +180,7 @@ if_nameindex (void) for (j = 0; j < i; ++j) free (idx[j].if_name); free (idx); - close (fd); + __close (fd); if (saved_errno == EINVAL) __set_errno (ENOSYS); return NULL; @@ -191,7 +191,7 @@ if_nameindex (void) idx[i].if_index = 0; idx[i].if_name = NULL; - close (fd); + __close (fd); return idx; #endif } @@ -224,18 +224,18 @@ if_indextoname (unsigned int ifindex, char *ifname) return NULL; ifr.ifr_ifindex = ifindex; - if (ioctl (fd, SIOGIFNAME, &ifr) < 0) + if (__ioctl (fd, SIOGIFNAME, &ifr) < 0) { if (errno == EINVAL) siogifname_works = 0; /* Don't make the same mistake twice. */ } else { - close (fd); + __close (fd); return strncpy (ifname, ifr.ifr_name, IFNAMSIZ); } - close (fd); + __close (fd); __set_errno (serrno); } diff --git a/sysdeps/unix/sysv/linux/listen.S b/sysdeps/unix/sysv/linux/listen.S index 4c7e435196..115bf2b2d0 100644 --- a/sysdeps/unix/sysv/linux/listen.S +++ b/sysdeps/unix/sysv/linux/listen.S @@ -1,3 +1,4 @@ #define socket listen #define NARGS 2 +#define NO_WEAK_ALIAS 1 #include diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index 2db8f8d08a..052516c7ac 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -75,7 +75,7 @@ __ptsname_r (fd, buf, buflen) #ifdef TIOCGPTN if (tiocgptn_works) { - if (ioctl (fd, TIOCGPTN, &ptyno) == 0) + if (__ioctl (fd, TIOCGPTN, &ptyno) == 0) goto gotit; else { diff --git a/sysdeps/unix/sysv/linux/recvfrom.S b/sysdeps/unix/sysv/linux/recvfrom.S index 93a3110d0a..7d0e2b0ea8 100644 --- a/sysdeps/unix/sysv/linux/recvfrom.S +++ b/sysdeps/unix/sysv/linux/recvfrom.S @@ -2,4 +2,3 @@ #define __socket __libc_recvfrom #define NARGS 6 #include -weak_alias (__libc_recvfrom, __recvfrom) diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c index 273add903e..16774c48b1 100644 --- a/sysdeps/unix/sysv/linux/sendmsg.c +++ b/sysdeps/unix/sysv/linux/sendmsg.c @@ -63,12 +63,12 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags) You can send real, effective, or set- uid and gid. If the user hasn't filled in the buffer, we default to real uid and gid. */ - pid = getpid (); + pid = __getpid (); if (cc->cmcred_pid != pid) { u->pid = pid; - u->uid = getuid (); - u->gid = getgid (); + u->uid = __getuid (); + u->gid = __getgid (); } else { diff --git a/sysdeps/unix/sysv/linux/sendto.S b/sysdeps/unix/sysv/linux/sendto.S index 8717b2bac1..f0acb88465 100644 --- a/sysdeps/unix/sysv/linux/sendto.S +++ b/sysdeps/unix/sysv/linux/sendto.S @@ -2,4 +2,3 @@ #define __socket __libc_sendto #define NARGS 6 #include -weak_alias (__libc_sendto, __sendto) diff --git a/sysdeps/unix/sysv/linux/setsockopt.S b/sysdeps/unix/sysv/linux/setsockopt.S index 01b2799ae8..09d9109be2 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.S +++ b/sysdeps/unix/sysv/linux/setsockopt.S @@ -1,3 +1,4 @@ #define socket setsockopt #define NARGS 5 +#define NO_WEAK_ALIAS 1 #include diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c index c3df2e6a49..74c4985fe1 100644 --- a/sysdeps/unix/sysv/linux/statvfs.c +++ b/sysdeps/unix/sysv/linux/statvfs.c @@ -30,7 +30,7 @@ statvfs (const char *file, struct statvfs *buf) int retval; int fd; - fd = open (file, O_RDONLY); + fd = __open (file, O_RDONLY); if (fd < 0) return -1; @@ -39,7 +39,7 @@ statvfs (const char *file, struct statvfs *buf) /* Close the file while preserving the error number. */ save_errno = errno; - close (fd); + __close (fd); __set_errno (save_errno); return retval; diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 7f276b6130..91f0d7a40f 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -72,7 +72,7 @@ getttyname (dev, 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, devlen - 1)) = '/'; @@ -86,14 +86,14 @@ getttyname (dev, 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/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c index 9f22f71f31..9c859caa25 100644 --- a/sysdeps/unix/sysv/linux/ttyname_r.c +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -46,14 +46,14 @@ getttyname_r (fd, buf, buflen, mydev, myino, save, dostat) struct dirent *d; size_t devlen = strlen (buf); - dirstream = opendir (buf); + dirstream = __opendir (buf); 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") @@ -65,7 +65,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; } @@ -81,13 +81,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/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c index 2d9e86a63a..ec0337428d 100644 --- a/sysdeps/unix/sysv/linux/ulimit.c +++ b/sysdeps/unix/sysv/linux/ulimit.c @@ -45,7 +45,7 @@ __ulimit (int cmd, ...) { case UL_GETFSIZE: /* Get limit on file size. */ - if (getrlimit (RLIMIT_FSIZE, &limit) == 0) + if (__getrlimit (RLIMIT_FSIZE, &limit) == 0) /* Convert from bytes to 512 byte units. */ result = limit.rlim_cur / 512; break; @@ -63,7 +63,7 @@ __ulimit (int cmd, ...) break; case __UL_GETOPENMAX: - result = sysconf (_SC_OPEN_MAX); + result = __sysconf (_SC_OPEN_MAX); break; default: diff --git a/sysdeps/unix/sysv/linux/unlockpt.c b/sysdeps/unix/sysv/linux/unlockpt.c index a5f0b2a484..e20545fe80 100644 --- a/sysdeps/unix/sysv/linux/unlockpt.c +++ b/sysdeps/unix/sysv/linux/unlockpt.c @@ -33,7 +33,7 @@ unlockpt (fd) int serrno = errno; int unlock = 0; - if (ioctl (fd, TIOCSPTLCK, &unlock)) + if (__ioctl (fd, TIOCSPTLCK, &unlock)) { if (errno == EINVAL) { diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h index 1530ff64d5..a21672b115 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -51,4 +51,6 @@ #define r1 %o1 #define MOVE(x,y) mov x, y +#define LOC(name) .##L##name + #endif /* __ASSEMBLER__ */ -- cgit v1.2.1