aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/fileops.c29
-rw-r--r--libio/iolibio.h19
-rw-r--r--libio/iopopen.c4
-rw-r--r--libio/ioseekoff.c9
-rw-r--r--libio/ioseekpos.c8
5 files changed, 39 insertions, 30 deletions
diff --git a/libio/fileops.c b/libio/fileops.c
index 10f7567b0a..001794d05a 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -40,7 +40,12 @@ extern int errno;
#ifdef _LIBC
-# define open(Name, Flags, Prot) __open ((Name), (Flags), (Prot))
+# define open(Name, Flags, Prot) __open (Name, Flags, Prot)
+# define close(FD) __close (FD)
+# define fstat(FD, Statbuf) __fstat (FD, Statbuf)
+# 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)
#endif
/* An fstream can be in at most one of put mode, get mode, or putback mode.
@@ -384,6 +389,10 @@ _IO_file_sync (fp)
_IO_FILE *fp;
{
_IO_size_t delta;
+ int retval = 0;
+
+ _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+ _IO_flockfile (fp);
/* char* ptr = cur_ptr(); */
if (fp->_IO_write_ptr > fp->_IO_write_base)
if (_IO_do_flush(fp)) return EOF;
@@ -402,12 +411,14 @@ _IO_file_sync (fp)
; /* Ignore error from unseekable devices. */
#endif
else
- return EOF;
+ retval = EOF;
}
- fp->_offset = _IO_pos_BAD;
+ if (retval != EOF)
+ fp->_offset = _IO_pos_BAD;
/* FIXME: Cleanup - can this be shared? */
/* setg(base(), ptr, ptr); */
- return 0;
+ _IO_cleanup_region_end (1);
+ return retval;
}
_IO_pos_t
@@ -575,7 +586,7 @@ _IO_file_read (fp, buf, size)
void *buf;
_IO_ssize_t size;
{
- return _IO_read (fp->_fileno, buf, size);
+ return read (fp->_fileno, buf, size);
}
_IO_pos_t
@@ -584,7 +595,7 @@ _IO_file_seek (fp, offset, dir)
_IO_off_t offset;
int dir;
{
- return _IO_lseek (fp->_fileno, offset, dir);
+ return lseek (fp->_fileno, offset, dir);
}
int
@@ -592,14 +603,14 @@ _IO_file_stat (fp, st)
_IO_FILE *fp;
void *st;
{
- return _IO_fstat (fp->_fileno, (struct stat *) st);
+ return fstat (fp->_fileno, (struct stat *) st);
}
int
_IO_file_close (fp)
_IO_FILE *fp;
{
- return _IO_close (fp->_fileno);
+ return close (fp->_fileno);
}
_IO_ssize_t
@@ -611,7 +622,7 @@ _IO_file_write (f, data, n)
_IO_ssize_t to_do = n;
while (to_do > 0)
{
- _IO_ssize_t count = _IO_write (f->_fileno, data, to_do);
+ _IO_ssize_t count = write (f->_fileno, data, to_do);
if (count == EOF)
{
f->_flags |= _IO_ERR_SEEN;
diff --git a/libio/iolibio.h b/libio/iolibio.h
index ca863b51b3..92df6a6fd2 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -56,22 +56,3 @@ extern _IO_FILE* _IO_popen __P((const char*, const char*));
#ifdef __cplusplus
}
#endif
-
-#define _IO_open __open
-#define _IO_close __close
-#define _IO_fork __fork
-#define _IO_fcntl __fcntl
-#define _IO__exit _exit
-#define _IO_read __read
-#define _IO_write __write
-#define _IO_lseek __lseek
-#define _IO_getdtablesize __getdtablesize
-#define _IO_pipe __pipe
-#define _IO_dup2 __dup2
-#define _IO_execl execl
-#define _IO_waitpid __waitpid
-#define _IO_stat __stat
-#define _IO_getpid __getpid
-#define _IO_geteuid __geteuid
-#define _IO_getegid __getegid
-#define _IO_fstat __fstat
diff --git a/libio/iopopen.c b/libio/iopopen.c
index 434008609f..59d4fc3f0e 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -68,6 +68,10 @@ extern int _IO_dup2 __P ((int fd, int fd2));
#define _IO__exit _exit
#endif
+#ifndef _IO_close
+#define _IO_close close
+#endif
+
struct _IO_proc_file
{
struct _IO_FILE_plus file;
diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c
index 8c642165f6..b1c4729b3d 100644
--- a/libio/ioseekoff.c
+++ b/libio/ioseekoff.c
@@ -32,9 +32,14 @@ _IO_seekoff (fp, offset, dir, mode)
int dir;
int mode;
{
+ _IO_pos_t retval;
+
/* If we have a backup buffer, get rid of it, since the __seekoff
callback may not know to do the right thing about it.
This may be over-kill, but it'll do for now. TODO */
+ _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+ _IO_flockfile (fp);
+
if (_IO_have_backup (fp))
{
@@ -42,6 +47,8 @@ _IO_seekoff (fp, offset, dir, mode)
offset -= fp->_IO_read_end - fp->_IO_read_ptr;
_IO_free_backup_area (fp);
}
+ retval = _IO_SEEKOFF (fp, offset, dir, mode);
- return _IO_SEEKOFF (fp, offset, dir, mode);
+ _IO_cleanup_region_end (1);
+ return retval;
}
diff --git a/libio/ioseekpos.c b/libio/ioseekpos.c
index 1ae88fb848..2ce0c2224e 100644
--- a/libio/ioseekpos.c
+++ b/libio/ioseekpos.c
@@ -31,12 +31,18 @@ _IO_seekpos (fp, pos, mode)
_IO_pos_t pos;
int mode;
{
+ _IO_pos_t retval;
+
/* If we have a backup buffer, get rid of it, since the __seekoff
callback may not know to do the right thing about it.
This may be over-kill, but it'll do for now. TODO */
+ _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+ _IO_flockfile (fp);
if (_IO_have_backup (fp))
_IO_free_backup_area (fp);
+ retval = _IO_SEEKPOS (fp, pos, mode);
- return _IO_SEEKPOS (fp, pos, mode);
+ _IO_cleanup_region_end (1);
+ return retval;
}