/* Skipping input from a FILE stream.
- Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 2007-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
-#elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */
- fp->_p += increment;
- fp->_r -= increment;
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+ fp_->_p += increment;
+ fp_->_r -= increment;
#elif defined __EMX__ /* emx+gcc */
fp->_ptr += increment;
fp->_rcount -= increment;
# endif
#elif defined __QNX__ /* QNX */
fp->_Next += increment;
+#elif defined __MINT__ /* Atari FreeMiNT */
+ fp->__bufp += increment;
+#elif defined SLOW_BUT_NO_HACKS /* users can define this */
#else
#error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your system, then report this to bug-gnulib."
#endif
size_t buffered;
if (freadptr (fp, &buffered) != NULL && buffered > 0)
- {
- size_t increment = (buffered < offset ? buffered : offset);
-
- freadptrinc (fp, increment);
- offset -= increment;
- if (offset == 0)
- return 0;
- total_buffered -= increment;
- if (total_buffered == 0)
- break;
- }
+ {
+ size_t increment = (buffered < offset ? buffered : offset);
+
+ freadptrinc (fp, increment);
+ offset -= increment;
+ if (offset == 0)
+ return 0;
+ total_buffered -= increment;
+ if (total_buffered == 0)
+ break;
+ }
/* Read one byte. If we were reading from the ungetc buffer, this
- switches the stream back to the main buffer. */
+ switches the stream back to the main buffer. */
if (fgetc (fp) == EOF)
- goto eof;
+ goto eof;
offset--;
if (offset == 0)
- return 0;
+ return 0;
total_buffered--;
}
if (fd >= 0 && lseek (fd, 0, SEEK_CUR) >= 0)
{
/* FP refers to a regular file. fseek is most efficient in this case. */
- return fseek (fp, offset, SEEK_CUR);
+ return fseeko (fp, offset, SEEK_CUR);
}
else
{
/* FP is a non-seekable stream, possibly not even referring to a file
- descriptor. Read OFFSET bytes explicitly and discard them. */
+ descriptor. Read OFFSET bytes explicitly and discard them. */
char buf[4096];
do
- {
- size_t count = (sizeof (buf) < offset ? sizeof (buf) : offset);
- if (fread (buf, 1, count, fp) < count)
- goto eof;
- offset -= count;
- }
+ {
+ size_t count = (sizeof (buf) < offset ? sizeof (buf) : offset);
+ if (fread (buf, 1, count, fp) < count)
+ goto eof;
+ offset -= count;
+ }
while (offset > 0);
return 0;