diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-04 08:27:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-04 08:27:37 +0000 |
| commit | ee8449f7293a20a2a971ecdbf3d31129a281dee4 (patch) | |
| tree | f25aa0962ffe3adf5afc014d61a9db0f8153c5c3 /libio | |
| parent | 58e8ec84f450f5f4eb00f4c445de9562bfa359e9 (diff) | |
| download | glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.gz glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.tar.bz2 glibc-ee8449f7293a20a2a971ecdbf3d31129a281dee4.zip | |
Update.
2003-09-04 Ulrich Drepper <drepper@redhat.com>
* libio/libio.h: Define _IO_FLAGS2_NOTCANCEL.
* libio/fileops.c [_LIBC]: Remove close macro.
(_IO_file_open): If _IO_FLAGS2_NOTCANCEL is set, use open_not_cancel.
(_IO_new_file_open): Recognize 'c' flag in mode string.
(_IO_file_read): If _IO_FLAGS2_NOTCANCEL is set use read_not_cancel.
(_IO_new_file_write): If _IO_FLAGS2_NOTCANCEL is set use
write_not_cancel.
* iconv/gconv_conf.c: Use fopen with 'c' mode flag.
* inet/rcmd.c: Likewise.
* inet/ruserpass.c: Likewise.
* intl/localealias.c: Likewise.
* malloc/mtrace.c: Likewise.
* misc/getpass.c: Likewise.
* misc/getttyent.c: Likewise.
* misc/mntent_r.c: Likewise.
* misc/getusershell.c: Likewise.
* nss/nsswitch.c: Likewise.
* resolv/res_hconf.c: Likewise.
* resolv/res_init.c: Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c: Likewise.
* time/getdate.c: Likewise.
* time/tzfile.c: Likewise.
* misc/fstab.h: Undo last change.
* misc/mntent.h: Likewise.
* misc/Makefile: Remove CFLAGS-mntent_r.c, CFLAGS-mntent.c, and
CFLAGS-fstab.c definition.
2003-09-04 Jakub Jelinek <jakub@redhat.com>
2003-09-03 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/fileops.c | 22 | ||||
| -rw-r--r-- | libio/libio.h | 1 |
2 files changed, 16 insertions, 7 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index 4993630efc..8a225ae5a5 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -59,7 +59,6 @@ extern int errno; #ifdef _LIBC # define open(Name, Flags, Prot) __open (Name, Flags, Prot) -# define close(FD) __close (FD) # define lseek(FD, Offset, Whence) __lseek (FD, Offset, Whence) # define read(FD, Buf, NBytes) __read (FD, Buf, NBytes) # define write(FD, Buf, NBytes) __write (FD, Buf, NBytes) @@ -226,10 +225,12 @@ _IO_file_open (fp, filename, posix_mode, prot, read_write, is32not64) int is32not64; { int fdesc; -#ifdef _G_OPEN64 - fdesc = (is32not64 - ? open (filename, posix_mode, prot) - : _G_OPEN64 (filename, posix_mode, prot)); +#ifdef _LIBC + if (fp->_flags2 & _IO_FLAGS2_NOTCANCEL) + fdesc = open_not_cancel (filename, + posix_mode | (is32not64 ? 0 : O_LARGEFILE), prot); + else + fdesc = open (filename, posix_mode | (is32not64 ? 0 : O_LARGEFILE), prot); #else fdesc = open (filename, posix_mode, prot); #endif @@ -318,6 +319,9 @@ _IO_new_file_fopen (fp, filename, mode, is32not64) case 'm': fp->_flags2 |= _IO_FLAGS2_MMAP; continue; + case 'c': + fp->_flags2 |= _IO_FLAGS2_NOTCANCEL; + break; default: /* Ignore. */ continue; @@ -1200,7 +1204,9 @@ _IO_file_read (fp, buf, size) void *buf; _IO_ssize_t size; { - return read (fp->_fileno, buf, size); + return ((fp->_flags2 & _IO_FLAGS2_NOTCANCEL) + ? read_not_cancel (fp->_fileno, buf, size) + : read (fp->_fileno, buf, size)); } INTDEF(_IO_file_read) @@ -1262,7 +1268,9 @@ _IO_new_file_write (f, data, n) _IO_ssize_t to_do = n; while (to_do > 0) { - _IO_ssize_t count = write (f->_fileno, data, to_do); + _IO_ssize_t count = ((f->_flags2 & _IO_FLAGS2_NOTCANCEL) + ? write_not_cancel (f->_fileno, data, to_do) + : write (f->_fileno, data, to_do)); if (count < 0) { f->_flags |= _IO_ERR_SEEN; diff --git a/libio/libio.h b/libio/libio.h index 11274aebb4..c70a86ae90 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -138,6 +138,7 @@ #define _IO_USER_LOCK 0x8000 #define _IO_FLAGS2_MMAP 1 +#define _IO_FLAGS2_NOTCANCEL 2 /* These are "formatting flags" matching the iostream fmtflags enum values. */ #define _IO_SKIPWS 01 |