summaryrefslogtreecommitdiff
path: root/src/libw32dll
diff options
context:
space:
mode:
authorChris Rankin <rankincj@yahoo.com>2011-10-01 14:14:27 +0100
committerChris Rankin <rankincj@yahoo.com>2011-10-01 14:14:27 +0100
commit62a669d9f04e83debe729347617a935707badc7e (patch)
tree3d71d5520db6c429666abf1823d2d20b082af97d /src/libw32dll
parent8ba50d7512e71ce2fa441f8e738459df21cec2ae (diff)
downloadxine-lib-62a669d9f04e83debe729347617a935707badc7e.tar.gz
xine-lib-62a669d9f04e83debe729347617a935707badc7e.tar.bz2
Mark simple file and socket descriptors as uninheritable.
This patch creates two utility functions: int open_cloexec(pathname, flags) int create_cloexec(pathname, flags, mode) These return a file descriptor with the CLOEXEC flag set, to ensure that the descriptor is not inherited across a fork/exec operation. The sockets returned by: _x_io_tcp_connect_ipv4() _x_io_tcp_connect() now also have their CLOEXEC flag set.
Diffstat (limited to 'src/libw32dll')
-rw-r--r--src/libw32dll/wine/registry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index 0ccf3de9b..6b9a30fa3 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -89,7 +89,7 @@ static void open_registry(void)
printf("Multiple open_registry(>\n");
return;
}
- fd = open(localregpathname, O_RDONLY);
+ fd = open_cloexec(localregpathname, O_RDONLY);
if (fd == -1)
{
printf("Creating new registry\n");
@@ -132,7 +132,7 @@ static void save_registry(void)
int fd, i;
if (!regs)
init_registry();
- fd = open(localregpathname, O_WRONLY | O_CREAT, 00666);
+ fd = create_cloexec(localregpathname, O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
if (fd == -1)
{
printf("Failed to open registry file '%s' for writing.\n",