projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'nsz/math'
[musl]
/
src
/
stdio
/
__fdopen.c
diff --git
a/src/stdio/__fdopen.c
b/src/stdio/__fdopen.c
index
235d348
..
59690f6
100644
(file)
--- a/
src/stdio/__fdopen.c
+++ b/
src/stdio/__fdopen.c
@@
-1,13
+1,21
@@
#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 */
/* Check for valid initial mode character */
- if (!strchr("rwa", *mode)) return 0;
+ if (!strchr("rwa", *mode)) {
+ errno = EINVAL;
+ return 0;
+ }
/* Allocate FILE+buffer or fail */
if (!(f=malloc(sizeof *f + UNGET + BUFSIZ))) return 0;
/* Allocate FILE+buffer or fail */
if (!(f=malloc(sizeof *f + UNGET + BUFSIZ))) return 0;
@@
-16,12
+24,15
@@
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') {
/* Set append mode on fd if opened for append */
if (*mode == 'a') {
- int flags =
syscall(SYS_fcntl, fd, F_GETFL, 0
);
- syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
+ int flags =
__syscall(SYS_fcntl, fd, F_GETFL
);
+
__
syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
}
f->fd = fd;
}
f->fd = fd;
@@
-30,7
+41,7
@@
FILE *__fdopen(int fd, const char *mode)
/* Activate line buffered mode for terminals */
f->lbf = EOF;
/* Activate line buffered mode for terminals */
f->lbf = EOF;
- if (!(f->flags & F_NOWR) && !syscall(SYS_ioctl, fd, TCGETS, &tio))
+ if (!(f->flags & F_NOWR) && !
__
syscall(SYS_ioctl, fd, TCGETS, &tio))
f->lbf = '\n';
/* Initialize op ptrs. No problem if some are unneeded. */
f->lbf = '\n';
/* Initialize op ptrs. No problem if some are unneeded. */
@@
-39,11
+50,13
@@
FILE *__fdopen(int fd, const char *mode)
f->seek = __stdio_seek;
f->close = __stdio_close;
f->seek = __stdio_seek;
f->close = __stdio_close;
+ if (!libc.threaded) f->lock = -1;
+
/* Add new FILE to open file list */
OFLLOCK();
/* Add new FILE to open file list */
OFLLOCK();
- f->next = ofl_head;
- if (
ofl_head)
ofl_head->prev = f;
- ofl_head = f;
+ f->next =
libc.
ofl_head;
+ if (
libc.ofl_head) libc.
ofl_head->prev = f;
+
libc.
ofl_head = f;
OFLUNLOCK();
return f;
OFLUNLOCK();
return f;