Changeset ef84413 in mainline for uspace/lib/posix/src

Timestamp:

2018-09-25T18:33:23Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

dc68f72

Parents:

5e6b76d

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-25 17:42:45)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-25 18:33:23)

Message:

libposix: Correctly disambiguate other uses of off_t

Location:

uspace/lib/posix/src

Files:

• stdio.c (modified) (3 diffs)
• unistd.c (modified) (2 diffs)

uspace/lib/posix/src/stdio.c

@@ -34 +34 @@
 /** @file Standard buffered input/output.
  */
+
+#define _LARGEFILE64_SOURCE
+#undef _FILE_OFFSET_BITS
 
 #include "internal/common.h"
@@ -181 +184 @@
 int fseeko(FILE *stream, off_t offset, int whence)
 {
-        return fseek64(stream, offset, whence);
+        return fseek(stream, offset, whence);
 }
 
@@ -191 +194 @@
  */
 off_t ftello(FILE *stream)
+{
+        return ftell(stream);
+}
+
+int fseeko64(FILE *stream, off64_t offset, int whence)
+{
+        return fseek64(stream, offset, whence);
+}
+
+off64_t ftello64(FILE *stream)
 {
         return ftell64(stream);

uspace/lib/posix/src/unistd.c

@@ -302 +302 @@
 off_t lseek(int fildes, off_t offset, int whence)
 {
-#if LONG_MAX == INT64_MAX
+#if LONG_MAX == INT_MAX
+        return _lseek(fildes, offset, LONG_MAX, whence);
+#else
         return _lseek64(fildes, offset, whence);
-#else
-        return _lseek(fildes, offset, LONG_MAX, whence);
 #endif
 }
@@ -331 +331 @@
  */
 int ftruncate(int fildes, off_t length)
+{
+        return ftruncate64(fildes, length);
+}
+
+int ftruncate64(int fildes, off64_t length)
 {
         if (failed(vfs_resize(fildes, (aoff64_t) length)))