Changeset 827d73f in mainline for uspace/lib/libc/generic/io/io.c

Timestamp:

2010-02-12T14:09:22Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a70bda4

Parents:

918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged the actual head

File:

• uspace/lib/libc/generic/io/io.c (modified) (3 diffs)

uspace/lib/libc/generic/io/io.c

@@ -541 +541 @@
 }
 
-int fseek(FILE *stream, long offset, int origin)
-{
-        off_t rc = lseek(stream->fd, offset, origin);
-        if (rc == (off_t) (-1)) {
-                /* errno has been set by lseek. */
+int fseek(FILE *stream, off64_t offset, int whence)
+{
+        off64_t rc = lseek(stream->fd, offset, whence);
+        if (rc == (off64_t) (-1)) {
+                /* errno has been set by lseek64. */
                 return -1;
         }
@@ -552 +552 @@
         
         return 0;
+}
+
+off64_t ftell(FILE *stream)
+{
+        return lseek(stream->fd, 0, SEEK_CUR);
 }
 
@@ -584 +589 @@
 }
 
+void clearerr(FILE *stream)
+{
+        stream->eof = false;
+        stream->error = false;
+}
+
 int fphone(FILE *stream)
 {