lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

fs: Undefine CONFIG_FS_LARGEFILE if compiler doesn't support long long

Browse source 
to simplify the large file check in many place

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-02-25 16:02:11 +08:00 committed by Alin Jerpelea
parent d2d954f691
commit 92b2f1bd3d
17 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/aio.h
View file

@ -97,7 +97,7 @@
#define LIO_NOWAIT 0 #define LIO_NOWAIT 0
#define LIO_WAIT 1 #define LIO_WAIT 1
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define aiocb64 aiocb # define aiocb64 aiocb
# define aio_read64 aio_read # define aio_read64 aio_read
# define aio_write64 aio_write # define aio_write64 aio_write

2
include/dirent.h
View file

@ -86,7 +86,7 @@
#define DIRENT_ISLINK(dtype) ((dtype) == DTYPE_LINK) #define DIRENT_ISLINK(dtype) ((dtype) == DTYPE_LINK)
#define DIRENT_ISSOCK(dtype) ((dtype) == DTYPE_SOCK) #define DIRENT_ISSOCK(dtype) ((dtype) == DTYPE_SOCK)
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define dirent64 dirent # define dirent64 dirent
# define readdir64 readdir # define readdir64 readdir
# define readdir64_r readdir_r # define readdir64_r readdir_r

2
include/fcntl.h
View file

@ -148,7 +148,7 @@
#define creat(path, mode) open(path, O_WRONLY|O_CREAT|O_TRUNC, mode) #define creat(path, mode) open(path, O_WRONLY|O_CREAT|O_TRUNC, mode)
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define F_GETLK64 F_GETLK # define F_GETLK64 F_GETLK
# define F_SETLK64 F_SETLK # define F_SETLK64 F_SETLK
# define F_SETLKW64 F_SETLKW # define F_SETLKW64 F_SETLKW

2
include/ftw.h
View file

@ -63,7 +63,7 @@
* it. */ * it. */
#endif #endif
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define ftw64 ftw # define ftw64 ftw
# define nftw64 nftw # define nftw64 nftw
#endif #endif

2
include/inttypes.h
View file

@ -308,7 +308,7 @@
/* off_t */ /* off_t */
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
#define PRIdOFF PRId64 #define PRIdOFF PRId64
#define PRIiOFF PRIi64 #define PRIiOFF PRIi64
#define PRIoOFF PRIo64 #define PRIoOFF PRIo64

4
include/nuttx/compiler.h
View file

@ -944,6 +944,10 @@
#endif #endif
#ifndef CONFIG_HAVE_LONG_LONG
# undef CONFIG_FS_LARGEFILE
#endif
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/

2
include/stdio.h
View file

@ -87,7 +87,7 @@
#define TMP_MAX 56800235584ull #define TMP_MAX 56800235584ull
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define tmpfile64 tmpfile # define tmpfile64 tmpfile
# define fopen64 fopen # define fopen64 fopen
# define freopen64 freopen # define freopen64 freopen

2
include/stdlib.h
View file

@ -68,7 +68,7 @@
# define environ get_environ_ptr() # define environ get_environ_ptr()
#endif #endif
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define mkstemp64 mkstemp # define mkstemp64 mkstemp
# define mkostemp64 mkostemp # define mkostemp64 mkostemp
# define mkstemps64 mkstemps # define mkstemps64 mkstemps

2
include/sys/mman.h
View file

@ -149,7 +149,7 @@
#define MFD_HUGE_2GB (31 << MFD_HUGE_SHIFT) #define MFD_HUGE_2GB (31 << MFD_HUGE_SHIFT)
#define MFD_HUGE_16GB (34 << MFD_HUGE_SHIFT) #define MFD_HUGE_16GB (34 << MFD_HUGE_SHIFT)
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define mmap64 mmap # define mmap64 mmap
#endif #endif

4
include/sys/resource.h
View file

@ -58,7 +58,7 @@
#define RLIMIT_STACK 6 /* Limit on stack size */ #define RLIMIT_STACK 6 /* Limit on stack size */
#define RLIMIT_AS 7 /* Limit on address space size */ #define RLIMIT_AS 7 /* Limit on address space size */
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define RLIM_INFINITY UINT64_MAX /* No limit */ # define RLIM_INFINITY UINT64_MAX /* No limit */
# define RLIM_SAVED_MAX UINT64_MAX /* Unrepresentable saved hard limit */ # define RLIM_SAVED_MAX UINT64_MAX /* Unrepresentable saved hard limit */
# define RLIM_SAVED_CUR UINT64_MAX /* Unrepresentable saved soft limit */ # define RLIM_SAVED_CUR UINT64_MAX /* Unrepresentable saved soft limit */
@ -95,7 +95,7 @@
* It must be an unsigned integral type. * It must be an unsigned integral type.
*/ */
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
typedef uint64_t rlim_t; typedef uint64_t rlim_t;
#else #else
typedef uint32_t rlim_t; typedef uint32_t rlim_t;

2
include/sys/sendfile.h
View file

@ -39,7 +39,7 @@
# define CONFIG_SENDFILE_BUFSIZE 512 # define CONFIG_SENDFILE_BUFSIZE 512
#endif #endif
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define sendfile64 sendfile # define sendfile64 sendfile
#endif #endif

2
include/sys/stat.h
View file

@ -122,7 +122,7 @@
#define st_ctime st_ctim.tv_sec #define st_ctime st_ctim.tv_sec
#define st_mtime st_mtim.tv_sec #define st_mtime st_mtim.tv_sec
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define stat64 stat # define stat64 stat
# define fstat64 fstat # define fstat64 fstat
# define lstat64 lstat # define lstat64 lstat

2
include/sys/statfs.h
View file

@ -95,7 +95,7 @@
#define CROMFS_MAGIC 0x4d4f5243 #define CROMFS_MAGIC 0x4d4f5243
#define RPMSGFS_MAGIC 0x54534f47 #define RPMSGFS_MAGIC 0x54534f47
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define statfs64 statfs # define statfs64 statfs
# define fstatfs64 fstatfs # define fstatfs64 fstatfs
#endif #endif

2
include/sys/statvfs.h
View file

@ -38,7 +38,7 @@
#define ST_RDONLY 0x0001 /* Mount read-only. */ #define ST_RDONLY 0x0001 /* Mount read-only. */
#define ST_NOSUID 0x0002 /* Ignore suid and sgid bits. */ #define ST_NOSUID 0x0002 /* Ignore suid and sgid bits. */
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define statvfs64 statvfs # define statvfs64 statvfs
# define fstatvfs64 fstatvfs # define fstatvfs64 fstatvfs
#endif #endif

4
include/sys/types.h
View file

@ -83,7 +83,7 @@
#define SCHED_PRIORITY_MIN 1 #define SCHED_PRIORITY_MIN 1
#define SCHED_PRIORITY_IDLE 0 #define SCHED_PRIORITY_IDLE 0
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define fsblkcnt64_t fsblkcnt_t # define fsblkcnt64_t fsblkcnt_t
# define fsfilcnt64_t fsfilcnt_t # define fsfilcnt64_t fsfilcnt_t
# define blkcnt64_t blkcnt_t # define blkcnt64_t blkcnt_t
@ -193,7 +193,7 @@ typedef int wint_t;
typedef int wctype_t; typedef int wctype_t;
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
/* Large file versions */ /* Large file versions */
typedef uint64_t fsblkcnt_t; typedef uint64_t fsblkcnt_t;

2
include/sys/uio.h
View file

@ -48,7 +48,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define preadv64 preadv # define preadv64 preadv
# define pwritev64 pwritev # define pwritev64 pwritev
#endif #endif

2
include/unistd.h
View file

@ -265,7 +265,7 @@
#define optind (*(getoptindp())) #define optind (*(getoptindp()))
#define optopt (*(getoptoptp())) #define optopt (*(getoptoptp()))
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) #if defined(CONFIG_FS_LARGEFILE)
# define lseek64 lseek # define lseek64 lseek
# define pread64 pread # define pread64 pread
# define pwrite64 pwrite # define pwrite64 pwrite