luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 13:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gspawn: Fold in safe_fdwalk_with_invalid_fds() helper function

Browse Source 
Since it’s now always called the same way after safe_fdwalk() has been
called. This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-11-22 14:28:59 +00:00
parent f0e08e3488
commit 3ee8dafb27
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gspawn.c
View File

@ -1412,6 +1412,8 @@ filename_to_fd (const char *p)
}
#endif
static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data);
/* This function is called between fork() and exec() and hence must be
* async-signal-safe (see signal-safety(7)). */
static int
@ -1493,8 +1495,7 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data)
return res;
#endif
errno = ENOSYS;
return -1;
return safe_fdwalk_with_invalid_fds (cb, data);
#endif
}
@ -1605,9 +1606,6 @@ safe_fdwalk_set_cloexec (int lowfd)
ret = safe_fdwalk (set_cloexec, GINT_TO_POINTER (lowfd));
if (ret < 0 && errno == ENOSYS)
ret = safe_fdwalk_with_invalid_fds (set_cloexec, GINT_TO_POINTER (lowfd));
return ret;
}
@ -1665,9 +1663,6 @@ safe_closefrom (int lowfd)
#endif /* HAVE_CLOSE_RANGE */
ret = safe_fdwalk (close_func_with_invalid_fds, GINT_TO_POINTER (lowfd));
if (ret < 0 && errno == ENOSYS)
ret = safe_fdwalk_with_invalid_fds (close_func_with_invalid_fds, GINT_TO_POINTER (lowfd));
return ret;
#endif
}