diff options
Diffstat (limited to 'libio')
-rw-r--r-- | libio/Makefile | 2 | ||||
-rw-r--r-- | libio/fseeko.c | 42 | ||||
-rw-r--r-- | libio/ftello.c | 50 | ||||
-rw-r--r-- | libio/stdio.h | 11 |
4 files changed, 104 insertions, 1 deletions
diff --git a/libio/Makefile b/libio/Makefile index e24e6ff66a..aea60f5226 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -32,7 +32,7 @@ routines := \ \ clearerr feof ferror fgetc fileno fputc freopen fseek getc getchar \ memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \ - iovdprintf vscanf vsnprintf obprintf fcloseall \ + iovdprintf vscanf vsnprintf obprintf fcloseall fseeko ftello \ \ libc_fatal diff --git a/libio/fseeko.c b/libio/fseeko.c new file mode 100644 index 0000000000..0ebdfa937e --- /dev/null +++ b/libio/fseeko.c @@ -0,0 +1,42 @@ +/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU IO Library. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + + As a special exception, if you link this library with files + compiled with a GNU compiler to produce an executable, this does + not cause the resulting executable to be covered by the GNU General + Public License. This exception does not however invalidate any + other reasons why the executable file might be covered by the GNU + General Public License. */ + +#include "libioP.h" +#include "stdio.h" + +int +fseeko (fp, offset, whence) + _IO_FILE* fp; + off_t offset; + int whence; +{ + int result; + CHECK_FILE (fp, -1); + _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); + _IO_flockfile (fp); + result = _IO_fseek (fp, offset, whence); + _IO_cleanup_region_end (1); + return result; +} diff --git a/libio/ftello.c b/libio/ftello.c new file mode 100644 index 0000000000..7585eea9ec --- /dev/null +++ b/libio/ftello.c @@ -0,0 +1,50 @@ +/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU IO Library. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + + As a special exception, if you link this library with files + compiled with a GNU compiler to produce an executable, this does + not cause the resulting executable to be covered by the GNU General + Public License. This exception does not however invalidate any + other reasons why the executable file might be covered by the GNU + General Public License. */ + +#include <stdio.h> +#include <libioP.h> +#include <errno.h> + + +off_t +ftello (fp) + _IO_FILE *fp; +{ + _IO_pos_t pos; + CHECK_FILE (fp, -1L); + _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); + _IO_flockfile (fp); + pos = _IO_seekoff (fp, 0, _IO_seek_cur, 0); + _IO_cleanup_region_end (1); + if (pos == _IO_pos_BAD) + { +#ifdef EIO + if (errno == 0) + __set_errno (EIO); +#endif + return -1L; + } + return _IO_pos_as_off (pos); +} diff --git a/libio/stdio.h b/libio/stdio.h index d941aba23b..bbed294056 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -496,6 +496,17 @@ extern long int ftell __P ((FILE *__stream)); /* Rewind to the beginning of STREAM. */ extern void rewind __P ((FILE *__stream)); +#ifdef __USE_UNIX98 +/* The Single Unix Specification, Version 2, specifies an alternative, + more adequate interface for the two functions above which deal with + file offset. `long int' is not the right type. */ + +/* Seek to a certain position on STREAM. */ +extern int fseeko __P ((FILE *__stream, __off_t __off, int __whence)); +/* Return the current position of STREAM. */ +extern __off_t ftello __P ((FILE *__stream)); +#endif + /* Get STREAM's position. */ extern int fgetpos __P ((FILE *__restrict __stream, fpos_t *__restrict __pos)); |