Changeset ef84413 in mainline

Timestamp:

2018-09-25T18:33:23Z (6 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

Files:

• c/generic/io/io.c (modified) (1 diff)
• posix/include/posix/stdio.h (modified) (1 diff)
• posix/include/posix/unistd.h (modified) (2 diffs)
• posix/src/stdio.c (modified) (3 diffs)
• posix/src/unistd.c (modified) (2 diffs)

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

@@ -911 +911 @@
 
         /* The native position is too large for the C99-ish interface. */
-        if (off > LONG_MAX)
-                return EOF;
+        if (off > LONG_MAX) {
+                errno = EOVERFLOW;
+                return -1;
+        }
 
         return off;

uspace/lib/posix/include/posix/stdio.h

@@ -61 +61 @@
     FILE *__restrict__ stream);
 
+#ifdef _LARGEFILE64_SOURCE
+extern int fseeko64(FILE *stream, off64_t offset, int whence);
+extern off64_t ftello64(FILE *stream);
+#endif
+
+#if _FILE_OFFSET_BITS == 64 && LONG_MAX == INT_MAX
+#ifdef __GNUC__
+extern int fseeko(FILE *stream, off_t offset, int whence) __asm__("fseeko64");
+extern off_t ftello(FILE *stream) __asm__("ftello64");
+#else
+extern int fseeko64(FILE *stream, off_t offset, int whence);
+extern off_t ftello64(FILE *stream);
+#define fseeko fseeko64
+#define ftello ftello64
+#endif
+#else
 extern int fseeko(FILE *stream, off_t offset, int whence);
 extern off_t ftello(FILE *stream);
+#endif
 
 /* Formatted Output */

uspace/lib/posix/include/posix/unistd.h

@@ -81 +81 @@
 extern ssize_t write(int fildes, const void *buf, size_t nbyte);
 extern int fsync(int fildes);
-extern int ftruncate(int fildes, off_t length);
 extern int rmdir(const char *path);
 extern int unlink(const char *path);
@@ -89 +88 @@
 #ifdef _LARGEFILE64_SOURCE
 extern off64_t lseek64(int fildes, off64_t offset, int whence);
+extern int ftruncate64(int fildes, off64_t length);
 #endif
 
-#if _FILE_OFFSET_BITS == 64
-static inline off_t lseek(int fildes, off_t offset, int whence)
-{
-        /* Declarations visible in this function body only. */
-        typedef int64_t off64_t;
-        extern off64_t lseek64(int fildes, off64_t offset, int whence);
-
-        /* With _FILE_OFFSET_BITS == 64, lseek is actually lseek64. */
-        return lseek64(fildes, offset, whence);
-}
+#if _FILE_OFFSET_BITS == 64 && LONG_MAX == INT_MAX
+#ifdef __GNUC__
+extern off_t lseek(int fildes, off_t offset, int whence) __asm__("lseek64");
+extern int ftruncate(int fildes, off_t length) __asm__("ftruncate64");
+#else
+extern off_t lseek64(int fildes, off_t offset, int whence);
+extern int ftruncate64(int fildes, off_t length);
+#define lseek lseek64
+#define ftruncate ftruncate64
+#endif
 #else
 extern off_t lseek(int fildes, off_t offset, int whence);
+extern int ftruncate(int fildes, off_t length);
 #endif
 

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)))