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

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/include/posix

Files:

• stdio.h (modified) (1 diff)
• unistd.h (modified) (2 diffs)

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