mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-18 04:54:52 +00:00
tools/nolibc/sys: make open() take a vararg on the 3rd argument
Let's pass a vararg to open() so that it remains compatible with existing code. The arg is only dereferenced when flags contain O_CREAT. The function is generally not inlined anymore, causing an extra call (total 16 extra bytes) but it's still optimized for constant propagation, limiting the excess to no more than 16 bytes in practice when open() is called without O_CREAT, and ~40 with O_CREAT, which remains reasonable. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
parent
acab7bcdb1
commit
a7604ba149
1 changed files with 15 additions and 3 deletions
|
@ -7,6 +7,7 @@
|
|||
#ifndef _NOLIBC_SYS_H
|
||||
#define _NOLIBC_SYS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include "std.h"
|
||||
|
||||
/* system includes */
|
||||
|
@ -719,7 +720,7 @@ int mount(const char *src, const char *tgt,
|
|||
|
||||
|
||||
/*
|
||||
* int open(const char *path, int flags, mode_t mode);
|
||||
* int open(const char *path, int flags[, mode_t mode]);
|
||||
*/
|
||||
|
||||
static __attribute__((unused))
|
||||
|
@ -735,9 +736,20 @@ int sys_open(const char *path, int flags, mode_t mode)
|
|||
}
|
||||
|
||||
static __attribute__((unused))
|
||||
int open(const char *path, int flags, mode_t mode)
|
||||
int open(const char *path, int flags, ...)
|
||||
{
|
||||
int ret = sys_open(path, flags, mode);
|
||||
mode_t mode = 0;
|
||||
int ret;
|
||||
|
||||
if (flags & O_CREAT) {
|
||||
va_list args;
|
||||
|
||||
va_start(args, flags);
|
||||
mode = va_arg(args, mode_t);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
ret = sys_open(path, flags, mode);
|
||||
|
||||
if (ret < 0) {
|
||||
SET_ERRNO(-ret);
|
||||
|
|
Loading…
Add table
Reference in a new issue