From: rofl0r Date: Sun, 18 Nov 2012 04:14:40 +0000 (+0100) Subject: fcntl.h: O_SEARCH was missing for powerpc X-Git-Tag: v0.9.8~33 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d2887f88475bb26ff4d48b661e26265a74e73bb;p=oweals%2Fmusl.git fcntl.h: O_SEARCH was missing for powerpc put some macros that do not differ between architectures in the main header and remove from bits. restructure mips header so it has the same structure as the others. --- diff --git a/arch/arm/bits/fcntl.h b/arch/arm/bits/fcntl.h index c0afa615..9595f9ca 100644 --- a/arch/arm/bits/fcntl.h +++ b/arch/arm/bits/fcntl.h @@ -10,15 +10,12 @@ #define O_DIRECTORY 040000 #define O_NOFOLLOW 0100000 #define O_CLOEXEC 02000000 -#define O_SEARCH 010000000 -#define O_EXEC 010000000 #define O_ASYNC 020000 #define O_DIRECT 0200000 #define O_LARGEFILE 0400000 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define O_PATH 010000000 #define F_DUPFD 0 #define F_GETFD 1 diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h index 04b7484c..69f3a8f5 100644 --- a/arch/i386/bits/fcntl.h +++ b/arch/i386/bits/fcntl.h @@ -10,15 +10,12 @@ #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -#define O_SEARCH 010000000 -#define O_EXEC 010000000 #define O_ASYNC 020000 #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define O_PATH 010000000 #define F_DUPFD 0 #define F_GETFD 1 diff --git a/arch/microblaze/bits/fcntl.h b/arch/microblaze/bits/fcntl.h index 04b7484c..69f3a8f5 100644 --- a/arch/microblaze/bits/fcntl.h +++ b/arch/microblaze/bits/fcntl.h @@ -10,15 +10,12 @@ #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -#define O_SEARCH 010000000 -#define O_EXEC 010000000 #define O_ASYNC 020000 #define O_DIRECT 040000 #define O_LARGEFILE 0100000 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define O_PATH 010000000 #define F_DUPFD 0 #define F_GETFD 1 diff --git a/arch/mips/bits/fcntl.h b/arch/mips/bits/fcntl.h index 116852e2..c681d237 100644 --- a/arch/mips/bits/fcntl.h +++ b/arch/mips/bits/fcntl.h @@ -1,23 +1,20 @@ +#define O_CREAT 0400 +#define O_EXCL 02000 +#define O_NOCTTY 04000 +#define O_TRUNC 01000 #define O_APPEND 0010 +#define O_NONBLOCK 0200 #define O_DSYNC 0020 #define O_SYNC 040020 #define O_RSYNC 040020 -#define O_NONBLOCK 0200 -#define O_CREAT 0400 -#define O_TRUNC 01000 -#define O_EXCL 02000 -#define O_NOCTTY 04000 -#define O_ASYNC 010000 -#define O_LARGEFILE 020000 -#define O_DIRECT 0100000 #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 -#define O_NOATIME 01000000 #define O_CLOEXEC 02000000 -#define O_PATH 010000000 -#define O_SEARCH 010000000 -#define O_EXEC 010000000 +#define O_ASYNC 010000 +#define O_DIRECT 0100000 +#define O_LARGEFILE 020000 +#define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK #define F_DUPFD 0 diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h index e8db7ae6..9e07229e 100644 --- a/arch/x86_64/bits/fcntl.h +++ b/arch/x86_64/bits/fcntl.h @@ -10,15 +10,12 @@ #define O_DIRECTORY 0200000 #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -#define O_SEARCH 010000000 -#define O_EXEC 010000000 #define O_ASYNC 020000 #define O_DIRECT 040000 #define O_LARGEFILE 0 #define O_NOATIME 01000000 #define O_NDELAY O_NONBLOCK -#define O_PATH 010000000 #define F_DUPFD 0 #define F_GETFD 1 diff --git a/include/fcntl.h b/include/fcntl.h index 9250e70e..70d4cbb5 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -37,6 +37,10 @@ int openat(int, const char *, int, ...); int posix_fadvise(int, off_t, off_t, int); int posix_fallocate(int, off_t, off_t); +#define O_SEARCH 010000000 +#define O_EXEC 010000000 +#define O_PATH 010000000 + #define O_ACCMODE (03|O_SEARCH) #define O_RDONLY 00 #define O_WRONLY 01