Changeset 1135 for Whitix

Timestamp:

10/14/08 19:39:48 (1 month ago)

Author:

mwhitworth

Message:

Add to fseek, various checks, optimize case where we can seek inside the buffer.

Files:

• Whitix/branches/keobject/user/libc/stdio/file.c (modified) (2 diffs)

Whitix/branches/keobject/user/libc/stdio/file.c

@@ -248 +248 @@
 int fseek(FILE* stream,long offset,int whence)
 {
+        long pos;
+        
         if (!stream)
-                return 0;
-
-        int position=SysSeek(stream->fd,offset,whence);
-
-        if (position >= 0)
-        {
-                stream->position=position;
+                return -1;
+                
+        stream->flags &= ~FILE_EOF;
+        
+        if (stream->buf && !(stream->flags & _IONBF))
+        {
+                pos = ftell(stream);
+                
+                if (whence == SEEK_CUR)
+                {
+                        offset += pos;
+                        whence = SEEK_SET;
+                }
+                
+                if (whence == SEEK_SET && pos-offset <= stream->ptr - stream->buf && offset-pos <= stream->count)
+                {
+                        stream->ptr += offset-pos;
+                        stream->count += pos-offset;
+                        
+                        stream->position = offset;
+                        
+                        return 0;
+                }
+        }
+        
+        pos = SysSeek(stream->fd,offset,whence);
+
+        if (pos >= 0)
+        {
+                stream->position=pos;
                 stream->count=0; /* Force fread to re-read buffer. */
+                stream->ptr = stream->buf;
         }else{
-                errno=-position;
+                errno=-pos;
                 stream->flags |= FILE_ERROR;
-                return 1;
+                return -1;
         }
 
@@ -402 +428 @@
 size_t fwrite_unlocked(const void* ptr, size_t size, size_t n, FILE* stream)
 {
-        printf("fwrite_unlocked\n");
-        return 0;
+        return fwrite(ptr, size, n, stream);
 }