diff options
Diffstat (limited to 'sysdeps/posix')
-rw-r--r-- | sysdeps/posix/cuserid.c | 4 | ||||
-rw-r--r-- | sysdeps/posix/euidaccess.c | 8 | ||||
-rw-r--r-- | sysdeps/posix/mkstemp.c | 4 | ||||
-rw-r--r-- | sysdeps/posix/mktemp.c | 2 | ||||
-rw-r--r-- | sysdeps/posix/pread.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/pread64.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/profil.c | 6 | ||||
-rw-r--r-- | sysdeps/posix/pwrite.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/pwrite64.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/sigblock.c | 4 | ||||
-rw-r--r-- | sysdeps/posix/sigpause.c | 6 | ||||
-rw-r--r-- | sysdeps/posix/ttyname.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/ttyname_r.c | 10 | ||||
-rw-r--r-- | sysdeps/posix/waitid.c | 2 |
14 files changed, 48 insertions, 48 deletions
diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c index 3108a46..68de92a 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 ed59582..d38e7cc 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 2c9c96b..d380935 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 ad5cb1d..e9a576c 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 22b8ca8..5ad5acb 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 00b1f33..16fb3df 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 3048146..beb5ae4 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 ef4a021..6558eb5 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 4045ed4..89ec261 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 efc559d..b652cf7 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 d954125..eced47e 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 5ad45ae..a865ded 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 ae427f1..d4c6e04 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 fa90211..7bb3bbe 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. */ |