Commit d5b48f95 authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney
Browse files

tools/nolibc: remove local definitions of O_* flags for open/fcntl 



The historic nolibc code did not include asm/fcntl.h and had to define
the various O_RDWR etc macros in each arch-specific file (since such
values differ between certain archs). This was found at least once to
induce bugs due to wrong definitions. Let's get rid of all of them and
include asm/nolibc.h from sys.h instead. This was verified to work
properly on all supported architectures.

Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 5a51b6de

tools/include/nolibc/arch-aarch64.h

+0 −12
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ 
#ifndef _NOLIBC_ARCH_AARCH64_H

#define _NOLIBC_ARCH_AARCH64_H



/* O_* macros for fcntl/open are architecture-specific */

#define O_RDONLY            0

#define O_WRONLY            1

#define O_RDWR              2

#define O_CREAT          0x40

#define O_EXCL           0x80

#define O_NOCTTY        0x100

#define O_TRUNC         0x200

#define O_APPEND        0x400

#define O_NONBLOCK      0x800

#define O_DIRECTORY    0x4000



/* The struct returned by the newfstatat() syscall. Differs slightly from the

 * x86_64's stat one by field ordering, so be careful.

 */

tools/include/nolibc/arch-arm.h

+0 −12
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ 
#ifndef _NOLIBC_ARCH_ARM_H

#define _NOLIBC_ARCH_ARM_H



/* O_* macros for fcntl/open are architecture-specific */

#define O_RDONLY            0

#define O_WRONLY            1

#define O_RDWR              2

#define O_CREAT          0x40

#define O_EXCL           0x80

#define O_NOCTTY        0x100

#define O_TRUNC         0x200

#define O_APPEND        0x400

#define O_NONBLOCK      0x800

#define O_DIRECTORY    0x4000



/* The struct returned by the stat() syscall, 32-bit only, the syscall returns

 * exactly 56 bytes (stops before the unused array). In big endian, the format

 * differs as devices are returned as short only.

tools/include/nolibc/arch-i386.h

+0 −12
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ 
#ifndef _NOLIBC_ARCH_I386_H

#define _NOLIBC_ARCH_I386_H



/* O_* macros for fcntl/open are architecture-specific */

#define O_RDONLY            0

#define O_WRONLY            1

#define O_RDWR              2

#define O_CREAT          0x40

#define O_EXCL           0x80

#define O_NOCTTY        0x100

#define O_TRUNC         0x200

#define O_APPEND        0x400

#define O_NONBLOCK      0x800

#define O_DIRECTORY   0x10000



/* The struct returned by the stat() syscall, 32-bit only, the syscall returns

 * exactly 56 bytes (stops before the unused array).

 */

tools/include/nolibc/arch-mips.h

+0 −12
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ 
#ifndef _NOLIBC_ARCH_MIPS_H

#define _NOLIBC_ARCH_MIPS_H



/* O_* macros for fcntl/open are architecture-specific */

#define O_RDONLY            0

#define O_WRONLY            1

#define O_RDWR              2

#define O_APPEND       0x0008

#define O_NONBLOCK     0x0080

#define O_CREAT        0x0100

#define O_TRUNC        0x0200

#define O_EXCL         0x0400

#define O_NOCTTY       0x0800

#define O_DIRECTORY   0x10000



/* The struct returned by the stat() syscall. 88 bytes are returned by the

 * syscall.

 */

tools/include/nolibc/arch-riscv.h

+0 −12
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ 
#ifndef _NOLIBC_ARCH_RISCV_H

#define _NOLIBC_ARCH_RISCV_H



/* O_* macros for fcntl/open are architecture-specific */

#define O_RDONLY            0

#define O_WRONLY            1

#define O_RDWR              2

#define O_CREAT          0x40

#define O_EXCL           0x80

#define O_NOCTTY        0x100

#define O_TRUNC         0x200

#define O_APPEND        0x400

#define O_NONBLOCK      0x800

#define O_DIRECTORY   0x10000



struct sys_stat_struct {

	unsigned long	st_dev;		/* Device.  */

	unsigned long	st_ino;		/* File serial number.  */