projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support linux kernel apis (new archs) with old syscalls removed
[musl]
/
src
/
stdio
/
__fdopen.c
diff --git
a/src/stdio/__fdopen.c
b/src/stdio/__fdopen.c
index
8bd51c6
..
a6ae73a
100644
(file)
--- a/
src/stdio/__fdopen.c
+++ b/
src/stdio/__fdopen.c
@@
-1,10
+1,15
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <stdlib.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
FILE *__fdopen(int fd, const char *mode)
{
FILE *f;
struct termios tio;
FILE *__fdopen(int fd, const char *mode)
{
FILE *f;
struct termios tio;
- int plus = !!strchr(mode, '+');
/* Check for valid initial mode character */
if (!strchr("rwa", *mode)) {
/* Check for valid initial mode character */
if (!strchr("rwa", *mode)) {
@@
-19,12
+24,17
@@
FILE *__fdopen(int fd, const char *mode)
memset(f, 0, sizeof *f);
/* Impose mode restrictions */
memset(f, 0, sizeof *f);
/* Impose mode restrictions */
- if (!plus) f->flags = (*mode == 'r') ? F_NOWR : F_NORD;
+ if (!strchr(mode, '+')) f->flags = (*mode == 'r') ? F_NOWR : F_NORD;
+
+ /* Apply close-on-exec flag */
+ if (strchr(mode, 'e')) __syscall(SYS_fcntl, fd, F_SETFD, FD_CLOEXEC);
/* Set append mode on fd if opened for append */
if (*mode == 'a') {
int flags = __syscall(SYS_fcntl, fd, F_GETFL);
/* Set append mode on fd if opened for append */
if (*mode == 'a') {
int flags = __syscall(SYS_fcntl, fd, F_GETFL);
- __syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
+ if (!(flags & O_APPEND))
+ __syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
+ f->flags |= F_APP;
}
f->fd = fd;
}
f->fd = fd;