mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
1999-12-18 Ulrich Drepper <drepper@cygnus.com> * include/unistd.h: Declare __libc_open64, __libc_lseek64, __libc_pread, __libc_pread64, __libc_pwrite, and __libc_pwrite64. * io/Versions: Export __libc_open64 and __libc_lseek64. * posix/Versions: Export __libc_pread, __libc_pread64, __libc_pwrite, and __libc_pwrite64. * sysdeps/generic/open64.c: Define __libc_* variant for cancelation wrapper. * sysdeps/generic/pread.c: Likewise. * sysdeps/generic/pread64.c: Likewise. * sysdeps/generic/pwrite.c: Likewise. * sysdeps/generic/pwrite64.c: Likewise. * sysdeps/posix/open64.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/llseek.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread64.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite64.c: Likewise. * sysdeps/posix/open64.c: Help gcc generating better code. * sysdeps/generic/libc-start.c (check_one_fd): Use __libc_open instead of __open.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* Write block to given position in file without changing file pointer.
|
||||
POSIX version.
|
||||
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
|
||||
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
||||
|
||||
@@ -23,28 +23,28 @@
|
||||
#include <unistd.h>
|
||||
|
||||
ssize_t
|
||||
__pwrite (int fd, const void *buf, size_t nbyte, off_t offset)
|
||||
__libc_pwrite (int fd, const void *buf, size_t nbyte, off_t offset)
|
||||
{
|
||||
/* Since we must not change the file pointer preserve the value so that
|
||||
we can restore it later. */
|
||||
int save_errno;
|
||||
ssize_t result;
|
||||
off_t old_offset = __lseek (fd, 0, SEEK_CUR);
|
||||
off_t old_offset = __libc_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 (__libc_lseek (fd, offset, SEEK_SET) == (off_t) -1)
|
||||
return -1;
|
||||
|
||||
/* Write out the data. */
|
||||
result = __write (fd, buf, nbyte);
|
||||
result = __libc_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 (__libc_lseek (fd, old_offset, SEEK_SET) == (off_t) -1)
|
||||
{
|
||||
if (result == -1)
|
||||
__set_errno (save_errno);
|
||||
@@ -55,6 +55,7 @@ __pwrite (int fd, const void *buf, size_t nbyte, off_t offset)
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifndef __pwrite
|
||||
weak_alias (__pwrite, pwrite)
|
||||
#ifndef __libc_pwrite
|
||||
strong_alias (__libc_pwrite, __pwrite)
|
||||
weak_alias (__libc_pwrite, pwrite)
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user