fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

darwin: Don't leave stdin/stdout closed

Browse source 
<rdar://problem/15609419>

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit ad8111d7c9)
This commit is contained in:
Jeremy Huddleston Sequoia 2013-12-07 01:14:37 -08:00
parent 200f98894a
commit 3218c1433f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
os/osinit.c
View file

@ -208,10 +208,18 @@ OsInit(void)
dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal); dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal);
#endif #endif
#if !defined(__CYGWIN__) #if !defined(XQUARTZ) /* STDIN is already /dev/null and STDOUT/STDERR is managed by console_redirect.c */
# if defined(__APPLE__)
int devnullfd = open(devnull, O_RDWR, 0);
assert(devnullfd > 2);
dup2(devnullfd, STDIN_FILENO);
dup2(devnullfd, STDOUT_FILENO);
close(devnullfd);
# elif !defined(__CYGWIN__)
fclose(stdin); fclose(stdin);
fclose(stdout); fclose(stdout);
#endif # endif
/* /*
* If a write of zero bytes to stderr returns non-zero, i.e. -1, * If a write of zero bytes to stderr returns non-zero, i.e. -1,
* then writing to stderr failed, and we'll write somewhere else * then writing to stderr failed, and we'll write somewhere else
@ -245,6 +253,7 @@ OsInit(void)
setlinebuf(stderr); setlinebuf(stderr);
#endif #endif
} }
#endif /* !XQUARTZ */
#if !defined(WIN32) || defined(__CYGWIN__) #if !defined(WIN32) || defined(__CYGWIN__)
if (getpgrp() == 0) if (getpgrp() == 0)