Changeset 2b3dd78 in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

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

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

@@ -799 +799 @@
 }
 
-int fseek(FILE *stream, long offset, int whence)
+int fseek64(FILE *stream, off64_t offset, int whence)
 {
         errno_t rc;
@@ -814 +814 @@
         stream->ungetc_chars = 0;
 
-        struct stat st;
+        vfs_stat_t st;
         switch (whence) {
         case SEEK_SET:
@@ -837 +837 @@
 }
 
-long ftell(FILE *stream)
-{
-        /* The native position is too large for the C99-ish interface. */
-        if (stream->pos - stream->ungetc_chars > LONG_MAX)
-                return EOF;
-
+off64_t ftell64(FILE *stream)
+{
         if (stream->error)
                 return EOF;
@@ -853 +849 @@
 
         return stream->pos - stream->ungetc_chars;
+}
+
+int fseek(FILE *stream, long offset, int whence)
+{
+        return fseek64(stream, offset, whence);
+}
+
+long ftell(FILE *stream)
+{
+        off64_t off = ftell64(stream);
+
+        /* The native position is too large for the C99-ish interface. */
+        if (off > LONG_MAX)
+                return EOF;
+
+        return off;
 }