colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: preserve errno in nm_utils_kill_child_sync()

Browse Source
This commit is contained in:
Thomas Haller
2015-05-03 14:08:31 +02:00
parent aa5cfdd7e1
commit ca4361bd53
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/NetworkManagerUtils.c
View File

@@ -624,13 +624,15 @@ _sleep_duration_convert_ms_to_us (guint32 sleep_duration_msec)
* sent unless the child already exited. If the child does not exit within @wait_before_kill_msec milliseconds, * sent unless the child already exited. If the child does not exit within @wait_before_kill_msec milliseconds,
* the function will send %SIGKILL and waits for the child indefinitly. If @wait_before_kill_msec is zero, no * the function will send %SIGKILL and waits for the child indefinitly. If @wait_before_kill_msec is zero, no
* %SIGKILL signal will be sent. * %SIGKILL signal will be sent.
*
* In case of error, errno is preserved to contain the last reason of failure.
**/ **/
gboolean gboolean
nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *log_name, nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *log_name,
int *child_status, guint32 wait_before_kill_msec, int *child_status, guint32 wait_before_kill_msec,
guint32 sleep_duration_msec) guint32 sleep_duration_msec)
{ {
int status = 0, errsv; int status = 0, errsv = 0;
pid_t ret; pid_t ret;
gboolean success = FALSE; gboolean success = FALSE;
gboolean was_waiting = FALSE, send_kill = FALSE; gboolean was_waiting = FALSE, send_kill = FALSE;
@@ -776,6 +778,7 @@ nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *lo
out: out:
if (child_status) if (child_status)
*child_status = success ? status : -1; *child_status = success ? status : -1;
errno = success ? 0 : errsv;
return success; return success;
} }