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

Timestamp:

2010-01-27T20:35:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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:

Merge mainline changes.

File:

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

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

@@ -554 +554 @@
 }
 
+int ftell(FILE *stream)
+{
+        off_t rc = lseek(stream->fd, 0, SEEK_CUR);
+        if (rc == (off_t) (-1)) {
+                /* errno has been set by lseek. */
+                return -1;
+        }
+
+        return rc;
+}
+
 void rewind(FILE *stream)
 {
@@ -584 +595 @@
 }
 
+void clearerr(FILE *stream)
+{
+        stream->eof = false;
+        stream->error = false;
+}
+
 int fphone(FILE *stream)
 {