wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Ken Thomases : winemenubuilder: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 31141a3beae2c2fe10ae177a8c22ae7ac6dd59d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31141a3beae2c2fe10ae177a8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:45 2011 -0600 winemenubuilder: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies. --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 755e0b2..c07507d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3321,11 +3321,11 @@ static void RefreshFileTypeAssociations(void) argv[0] = "update-mime-database"; argv[1] = mime_dir; argv[2] = NULL; - spawnvp( _P_NOWAIT, argv[0], argv ); + spawnvp( _P_DETACH, argv[0], argv ); argv[0] = "update-desktop-database"; argv[1] = applications_dir; - spawnvp( _P_NOWAIT, argv[0], argv ); + spawnvp( _P_DETACH, argv[0], argv ); } end:

1 0

Ken Thomases : explorer: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 92298f59feeaf3608c2a1970701c83f7f8156f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92298f59feeaf3608c2a19707… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:41 2011 -0600 explorer: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index b2f7730..bf04d4f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -42,7 +42,7 @@ static BOOL start_screensaver( void ) if (using_root) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = spawnvp( _P_NOWAIT, argv[0], argv ); + int pid = spawnvp( _P_DETACH, argv[0], argv ); if (pid > 0) { WINE_TRACE( "started process %d\n", pid );

1 0

Ken Thomases : libport: For spawnvp(_P_DETACH, ...), double-fork to avoid creating zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: fda27ccc1b8357302708601f0618ea9915aa236a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda27ccc1b8357302708601f0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:37 2011 -0600 libport: For spawnvp(_P_DETACH, ...), double-fork to avoid creating zombies. --- libs/port/spawn.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 40efebb..0cdc08c 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -36,7 +36,7 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) { #ifndef HAVE__SPAWNVP - int pid = 0, status, wret; + int pid, status, wret; if (mode == _P_OVERLAY) { @@ -51,20 +51,45 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) pid = fork(); if (pid == 0) { + /* in child */ + if (mode == _P_DETACH) + { + pid = fork(); + if (pid == -1) _exit(1); + else if (pid > 0) _exit(0); + /* else in grandchild */ + } + signal( SIGPIPE, SIG_DFL ); execvp(cmdname, (char **)argv); _exit(1); } - if (pid != -1 && mode == _P_OVERLAY) exit(0); + if (pid == -1) + return -1; + + if (mode == _P_OVERLAY) exit(0); - if (pid != -1 && mode == _P_WAIT) + if (mode == _P_WAIT || mode == _P_DETACH) { while (pid != (wret = waitpid(pid, &status, 0))) if (wret == -1 && errno != EINTR) break; - if (pid == wret && WIFEXITED(status)) pid = WEXITSTATUS(status); - else pid = 255; /* abnormal exit with an abort or an interrupt */ + if (pid == wret && WIFEXITED(status)) + { + if (mode == _P_WAIT) + pid = WEXITSTATUS(status); + else /* mode == _P_DETACH */ + if (WEXITSTATUS(status) != 0) /* child couldn't fork grandchild */ + pid = -1; + } + else + { + if (mode == _P_WAIT) + pid = 255; /* abnormal exit with an abort or an interrupt */ + else /* mode == _P_DETACH */ + pid = -1; + } } return pid;

1 0

Ken Thomases : libwine: Reap child process to avoid leaving a zombie.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: abe6a13ff1295a8d9290ed2141dd161b5b9b30d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe6a13ff1295a8d9290ed214… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:32 2011 -0600 libwine: Reap child process to avoid leaving a zombie. --- libs/wine/mmap.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 63a597d..1529a85 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -101,7 +101,7 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, { char * volatile result = NULL; int pagesize = getpagesize(); - pid_t pid; + pid_t pid, wret; /* We only try to map to a fixed address if addr is non-NULL and properly aligned, @@ -150,9 +150,10 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, _exit(1); } - /* vfork() lets the parent continue only after the child - has exited. Furthermore, Wine sets SIGCHLD to SIG_IGN, - so we don't need to wait for the child. */ + /* reap child */ + do { + wret = waitpid(pid, NULL, 0); + } while (wret < 0 && errno == EINTR); return result == addr; }

1 0

Ken Thomases : secur32: Reap child process to avoid leaving a zombie.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 3de1c713647ced81675e4041beb9b254db45585e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de1c713647ced81675e4041b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:27 2011 -0600 secur32: Reap child process to avoid leaving a zombie. --- dlls/secur32/dispatcher.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index ba59231..88e81ba 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -28,7 +28,10 @@ #include <sys/types.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif +#endif +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif #include <stdlib.h> #include <fcntl.h> #include "windef.h" @@ -276,7 +279,7 @@ void cleanup_helper(PNegoHelper helper) { TRACE("Killing helper %p\n", helper); - if( (helper == NULL) || (helper->helper_pid == 0)) + if(helper == NULL) return; HeapFree(GetProcessHeap(), 0, helper->com_buf); @@ -285,6 +288,16 @@ void cleanup_helper(PNegoHelper helper) close(helper->pipe_out); close(helper->pipe_in); +#ifdef HAVE_FORK + if (helper->helper_pid > 0) /* reap child */ + { + pid_t wret; + do { + wret = waitpid(helper->helper_pid, NULL, 0); + } while (wret < 0 && errno == EINTR); + } +#endif + HeapFree(GetProcessHeap(), 0, helper); }

1 0

Ken Thomases : netapi32: Wait for and reap smbpasswd child process.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 9979725211ecd3c6cdcb53b9c2501dca95978f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9979725211ecd3c6cdcb53b9c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:20 2011 -0600 netapi32: Wait for and reap smbpasswd child process. --- dlls/netapi32/access.c | 45 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 7cd05fc..d3b9063 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -21,6 +21,12 @@ #include "config.h" #include <stdarg.h> #include <fcntl.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -872,7 +878,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } -static int fork_smbpasswd( char * const argv[] ) +static int fork_smbpasswd( char * const argv[], pid_t *pid ) { #ifdef HAVE_FORK int pipe_out[2]; @@ -881,7 +887,7 @@ static int fork_smbpasswd( char * const argv[] ) fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); - switch (fork()) + switch ((*pid = fork())) { case -1: close( pipe_out[0] ); @@ -893,7 +899,7 @@ static int fork_smbpasswd( char * const argv[] ) close( pipe_out[1] ); execvp( "smbpasswd", argv ); ERR( "can't execute smbpasswd, is it installed?\n" ); - return -1; + _exit(1); default: close( pipe_out[0] ); break; @@ -917,12 +923,14 @@ static char *strdup_unixcp( const WCHAR *str ) static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, LPCWSTR oldpassword, LPCWSTR newpassword ) { + NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; static char option_remote[] = "-r"; static char smbpasswd[] = "smbpasswd"; int pipe_out; - char *server = NULL, *user, *argv[7], *old, *new; + pid_t pid; + char *server = NULL, *user, *argv[7], *old, *new = NULL; if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; if (!(user = strdup_unixcp( username ))) @@ -942,21 +950,20 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, } else argv[4] = NULL; - pipe_out = fork_smbpasswd( argv ); + pipe_out = fork_smbpasswd( argv, &pid ); HeapFree( GetProcessHeap(), 0, server ); HeapFree( GetProcessHeap(), 0, user ); if (pipe_out == -1) return NERR_InternalError; if (!(old = strdup_unixcp( oldpassword ))) { - close( pipe_out ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; } if (!(new = strdup_unixcp( newpassword ))) { - close( pipe_out ); - HeapFree( GetProcessHeap(), 0, old ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; } write( pipe_out, old, strlen( old ) ); write( pipe_out, "\n", 1 ); @@ -965,10 +972,26 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, write( pipe_out, new, strlen( new ) ); write( pipe_out, "\n", 1 ); +end: close( pipe_out ); + +#ifdef HAVE_FORK + { + pid_t wret; + int status; + + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); + if (ret == NERR_Success && + (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) + ret = NERR_InternalError; + } +#endif + HeapFree( GetProcessHeap(), 0, old ); HeapFree( GetProcessHeap(), 0, new ); - return NERR_Success; + return ret; } /******************************************************************************

1 0

Ken Thomases : winspool: Wait for and reap print spool child process.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 6df7adfff1a344ab7983b49e4ccb8f1d133b9171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df7adfff1a344ab7983b49e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:14 2011 -0600 winspool: Wait for and reap print spool child process. --- dlls/winspool.drv/info.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7bf9149..68ab5d7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -33,6 +33,12 @@ #include <string.h> #include <ctype.h> #include <stddef.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -7408,6 +7414,8 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) int fds[2] = {-1, -1}, file_fd = -1, no_read; BOOL ret = FALSE; char buf[1024]; + pid_t pid, wret; + int status; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; @@ -7427,7 +7435,7 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) goto end; } - if (fork() == 0) + if ((pid = fork()) == 0) { close(0); dup2(fds[0], 0); @@ -7439,10 +7447,33 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); _exit(1); } + else if (pid == -1) + { + ERR("fork() failed!\n"); + goto end; + } while((no_read = read(file_fd, buf, sizeof(buf))) > 0) write(fds[1], buf, no_read); + close(fds[1]); + fds[1] = -1; + + /* reap child */ + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); + if (wret < 0) + { + ERR("waitpid() failed!\n"); + goto end; + } + if (!WIFEXITED(status) || WEXITSTATUS(status)) + { + ERR("child process failed! %d\n", status); + goto end; + } + ret = TRUE; end:

1 0

Ken Thomases : gdi.exe16: Wait for and reap print spool child process.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 6c8929f83fb4e6bb456bc6bcfb3e9a0f83f81474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8929f83fb4e6bb456bc6bcf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:06 2011 -0600 gdi.exe16: Wait for and reap print spool child process. --- dlls/gdi.exe16/printdrv.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index 3bd0605..c1665f5 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -34,6 +34,9 @@ #ifdef HAVE_IO_H # include <io.h> #endif +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -205,6 +208,7 @@ typedef struct PRINTJOB HANDLE16 hHandle; int nIndex; int fd; + pid_t pid; } PRINTJOB, *PPRINTJOB; #define MAX_PRINT_JOBS 1 @@ -218,7 +222,7 @@ static PPRINTJOB FindPrintJobFromHandle(HANDLE16 hHandle) return gPrintJobsTable[0]; } -static int CreateSpoolFile(LPCSTR pszOutput) +static int CreateSpoolFile(LPCSTR pszOutput, pid_t *out_pid) { int fd=-1; char psCmd[1024]; @@ -227,9 +231,11 @@ static int CreateSpoolFile(LPCSTR pszOutput) /* TTD convert the 'output device' into a spool file name */ - if (pszOutput == NULL || *pszOutput == '\0') + if (pszOutput == NULL || *pszOutput == '\0' || out_pid == NULL) return -1; + *out_pid = -1; + psCmd[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\Spooler", &hkey)) @@ -263,7 +269,7 @@ static int CreateSpoolFile(LPCSTR pszOutput) ERR("pipe() failed!\n"); return -1; } - if (fork() == 0) + if ((*out_pid = fork()) == 0) { psCmdP++; @@ -317,12 +323,22 @@ static int FreePrintJob(HANDLE16 hJob) pPrintJob = FindPrintJobFromHandle(hJob); if (pPrintJob != NULL) { + nRet = SP_OK; gPrintJobsTable[pPrintJob->nIndex] = NULL; HeapFree(GetProcessHeap(), 0, pPrintJob->pszOutput); HeapFree(GetProcessHeap(), 0, pPrintJob->pszTitle); if (pPrintJob->fd >= 0) close(pPrintJob->fd); + if (pPrintJob->pid > 0) + { + pid_t wret; + int status; + do { + wret = waitpid(pPrintJob->pid, &status, 0); + } while (wret < 0 && errno == EINTR); + if (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) + nRet = SP_ERROR; + } HeapFree(GetProcessHeap(), 0, pPrintJob); - nRet = SP_OK; } return nRet; } @@ -342,9 +358,10 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) if (pPrintJob == NULL) { int fd; + pid_t pid; /* Try and create a spool file */ - fd = CreateSpoolFile(lpOutput); + fd = CreateSpoolFile(lpOutput, &pid); if (fd >= 0) { pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB)); @@ -364,6 +381,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) } pPrintJob->hDC = hDC; pPrintJob->fd = fd; + pPrintJob->pid = pid; pPrintJob->nIndex = 0; pPrintJob->hHandle = hHandle; gPrintJobsTable[pPrintJob->nIndex] = pPrintJob;

1 0

Ken Thomases : kernel32: Use double-fork to avoid leaving zombie processes.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 5bac5ee26ef4abc56155f9458e303927c93a185e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bac5ee26ef4abc56155f9458… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 18:20:24 2011 -0600 kernel32: Use double-fork to avoid leaving zombie processes. --- dlls/kernel32/process.c | 153 +++++++++++++++++++++++++++------------------- 1 files changed, 90 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ae3bbb2..0fc2c2b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -41,6 +41,9 @@ # include <sys/prctl.h> #endif #include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -1505,11 +1508,11 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!(pid = fork())) /* child */ { - close( fd[0] ); - - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (!(pid = fork())) /* grandchild */ { - if (!(pid = fork())) + close( fd[0] ); + + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) { int nullfd = open( "/dev/null", O_RDWR ); setsid(); @@ -1521,36 +1524,41 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA close( nullfd ); } } - else if (pid != -1) _exit(0); /* parent */ - } - else - { - if (stdin_fd != -1) - { - dup2( stdin_fd, 0 ); - close( stdin_fd ); - } - if (stdout_fd != -1) - { - dup2( stdout_fd, 1 ); - close( stdout_fd ); - } - if (stderr_fd != -1) + else { - dup2( stderr_fd, 2 ); - close( stderr_fd ); + if (stdin_fd != -1) + { + dup2( stdin_fd, 0 ); + close( stdin_fd ); + } + if (stdout_fd != -1) + { + dup2( stdout_fd, 1 ); + close( stdout_fd ); + } + if (stderr_fd != -1) + { + dup2( stderr_fd, 2 ); + close( stderr_fd ); + } } - } - /* Reset signals that we previously set to SIG_IGN */ - signal( SIGPIPE, SIG_DFL ); + /* Reset signals that we previously set to SIG_IGN */ + signal( SIGPIPE, SIG_DFL ); - if (newdir) chdir(newdir); + if (newdir) chdir(newdir); + + if (argv && envp) execve( filename, argv, envp ); + } + + if (pid <= 0) /* grandchild if exec failed or child if fork failed */ + { + err = errno; + write( fd[1], &err, sizeof(err) ); + _exit(1); + } - if (argv && envp) execve( filename, argv, envp ); - err = errno; - write( fd[1], &err, sizeof(err) ); - _exit(1); + _exit(0); /* child if fork succeeded */ } HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, envp ); @@ -1558,10 +1566,18 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (stdout_fd != -1) close( stdout_fd ); if (stderr_fd != -1) close( stderr_fd ); close( fd[1] ); - if ((pid != -1) && (read( fd[0], &err, sizeof(err) ) > 0)) /* exec failed */ + if (pid != -1) { - errno = err; - pid = -1; + /* reap child */ + do { + err = waitpid(pid, NULL, 0); + } while (err < 0 && errno == EINTR); + + if (read( fd[0], &err, sizeof(err) ) > 0) /* exec or second fork failed */ + { + errno = err; + pid = -1; + } } if (pid == -1) FILE_SetDosError(); close( fd[0] ); @@ -1805,11 +1821,11 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, if (exec_only || !(pid = fork())) /* child */ { - char preloader_reserve[64], socket_env[64]; - - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (exec_only || !(pid = fork())) /* grandchild */ { - if (!(pid = fork())) + char preloader_reserve[64], socket_env[64]; + + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) { int fd = open( "/dev/null", O_RDWR ); setsid(); @@ -1821,44 +1837,55 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, close( fd ); } } - else if (pid != -1) _exit(0); /* parent */ - } - else - { - if (stdin_fd != -1) dup2( stdin_fd, 0 ); - if (stdout_fd != -1) dup2( stdout_fd, 1 ); - } + else + { + if (stdin_fd != -1) dup2( stdin_fd, 0 ); + if (stdout_fd != -1) dup2( stdout_fd, 1 ); + } - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); - /* Reset signals that we previously set to SIG_IGN */ - signal( SIGPIPE, SIG_DFL ); + /* Reset signals that we previously set to SIG_IGN */ + signal( SIGPIPE, SIG_DFL ); - sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); - sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", - (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); + sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); + sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", + (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); - putenv( preloader_reserve ); - putenv( socket_env ); - if (winedebug) putenv( winedebug ); - if (wineloader) putenv( wineloader ); - if (unixdir) chdir(unixdir); + putenv( preloader_reserve ); + putenv( socket_env ); + if (winedebug) putenv( winedebug ); + if (wineloader) putenv( wineloader ); + if (unixdir) chdir(unixdir); - if (argv) - { - do + if (argv) { - wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); - } + do + { + wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); + } #ifdef __APPLE__ - while (errno == ENOTSUP && exec_only && terminate_main_thread()); + while (errno == ENOTSUP && exec_only && terminate_main_thread()); #else - while (0); + while (0); #endif + } + _exit(1); } - _exit(1); + + _exit(pid == -1); } + + if (pid != -1) + { + /* reap child */ + pid_t wret; + do { + wret = waitpid(pid, NULL, 0); + } while (wret < 0 && errno == EINTR); + } + HeapFree( GetProcessHeap(), 0, wineloader ); HeapFree( GetProcessHeap(), 0, argv ); return pid;

1 0

Ken Thomases : winspool: No need to reset SIGCHLD because we' re not changing it anymore.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 7a88d5a1e40c1c82e7eb308b59e46b9700448fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a88d5a1e40c1c82e7eb308b5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:58 2011 -0600 winspool: No need to reset SIGCHLD because we're not changing it anymore. --- dlls/winspool.drv/info.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index abc8478..7bf9149 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7435,7 +7435,6 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) /* reset signals that we previously set to SIG_IGN */ signal(SIGPIPE, SIG_DFL); - signal(SIGCHLD, SIG_DFL); execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); _exit(1);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011