jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove g_signal and change g_waitpid to check for signal

Browse Source
This commit is contained in:
jsorg71 2009-05-29 02:03:10 +00:00
parent e1461fd946
commit 48e06d5267
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/os_calls.c
View File

@ -914,7 +914,7 @@ g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs, int wcount,
if ((errno == EAGAIN) || if ((errno == EAGAIN) ||
(errno == EWOULDBLOCK) || (errno == EWOULDBLOCK) ||
(errno == EINPROGRESS) || (errno == EINPROGRESS) ||
(errno == EINTR)) /* signal occured */ (errno == EINTR)) /* signal occurred */
{ {
return 0; return 0;
} }
@ -1711,17 +1711,6 @@ g_execlp3(const char* a1, const char* a2, const char* a3)
#endif #endif
} }
/*****************************************************************************/
/* does not work in win32 */
void APP_CC
g_signal(int sig_num, void (*func)(int))
{
#if defined(_WIN32)
#else
signal(sig_num, func);
#endif
}
/*****************************************************************************/ /*****************************************************************************/
/* does not work in win32 */ /* does not work in win32 */
void APP_CC void APP_CC
@ -1852,7 +1841,8 @@ g_setuid(int pid)
} }
/*****************************************************************************/ /*****************************************************************************/
/* does not work in win32 */ /* does not work in win32
returns pid of process that exits or zero if signal occurred */
int APP_CC int APP_CC
g_waitchild(void) g_waitchild(void)
{ {
@ -1860,20 +1850,40 @@ g_waitchild(void)
return 0; return 0;
#else #else
int wstat; int wstat;
int rv;
return waitpid(0, &wstat, WNOHANG); rv = waitpid(0, &wstat, WNOHANG);
if (rv == -1)
{
if (errno == EINTR) /* signal occurred */
{
rv = 0;
}
}
return rv;
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/
/* does not work in win32 */ /* does not work in win32
returns pid of process that exits or zero if signal occurred */
int APP_CC int APP_CC
g_waitpid(int pid) g_waitpid(int pid)
{ {
#if defined(_WIN32) #if defined(_WIN32)
return 0; return 0;
#else #else
return waitpid(pid, 0, 0); int rv;
rv = waitpid(pid, 0, 0);
if (rv == -1)
{
if (errno == EINTR) /* signal occurred */
{
rv = 0;
}
}
return rv;
#endif #endif
} }

2
common/os_calls.h
View File

@ -195,8 +195,6 @@ g_execvp(const char* p1, char* args[]);
int APP_CC int APP_CC
g_execlp3(const char* a1, const char* a2, const char* a3); g_execlp3(const char* a1, const char* a2, const char* a3);
void APP_CC void APP_CC
g_signal(int sig_num, void (*func)(int));
void APP_CC
g_signal_child_stop(void (*func)(int)); g_signal_child_stop(void (*func)(int));
void APP_CC void APP_CC
g_signal_hang_up(void (*func)(int)); g_signal_hang_up(void (*func)(int));