X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffreadseek.c;h=4fbad2d784b96bb1a9b328941dd87dbebbf97419;hb=260e67ceada4f5a198c34a018e8eff4bf15b8a4a;hp=bb6a7ad797a3de3feb83b493dc5d402cc1b4aaa0;hpb=cc6492ad1a98f8e0609788ed65dc7d2b874c991e;p=gnulib.git

diff --git a/lib/freadseek.c b/lib/freadseek.c
index bb6a7ad79..4fbad2d78 100644
--- a/lib/freadseek.c
+++ b/lib/freadseek.c
@@ -1,5 +1,5 @@
 /* Skipping input from a FILE stream.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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
@@ -25,6 +25,8 @@
 #include "freadahead.h"
 #include "freadptr.h"
 
+#include "stdio-impl.h"
+
 /* Increment the in-memory pointer.  INCREMENT must be at most the buffer size
    returned by freadptr().
    This is very cheap (no system calls).  */
@@ -32,33 +34,20 @@ static inline void
 freadptrinc (FILE *fp, size_t increment)
 {
   /* Keep this code in sync with freadptr!  */
-#if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
+#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;
-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */
-# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
-#  define fp_ ((struct { unsigned char *_ptr; \
-			 unsigned char *_base; \
-			 unsigned char *_end; \
-			 long _cnt; \
-			 int _file; \
-			 unsigned int _flag; \
-		       } *) fp)
+#elif defined __minix               /* Minix */
+  fp_->_ptr += increment;
+  fp_->_count -= increment;
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   fp_->_ptr += increment;
   fp_->_cnt -= increment;
-# else
-#  if defined _SCO_DS               /* OpenServer */
-#   define _ptr __ptr
-#   define _cnt __cnt
-#  endif
-  fp->_ptr += increment;
-  fp->_cnt -= increment;
-# endif
 #elif defined __UCLIBC__            /* uClibc */
 # ifdef __STDIO_BUFFERS
   fp->__bufpos += increment;
@@ -67,6 +56,9 @@ freadptrinc (FILE *fp, size_t 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
@@ -91,24 +83,24 @@ freadseek (FILE *fp, size_t offset)
       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--;
     }
 
@@ -117,21 +109,21 @@ freadseek (FILE *fp, size_t offset)
   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;