luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gspawn: add new error message for open() failures

Browse Source 
Reporting these as dup2() failures is bogus.
This commit is contained in:
Michael Catanzaro 2021-12-14 13:36:30 -06:00
parent 34de33a9bd
commit b251a7cd18
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glib/gspawn.c
View File

@ -1620,6 +1620,7 @@ enum
{ {
CHILD_CHDIR_FAILED, CHILD_CHDIR_FAILED,
CHILD_EXEC_FAILED, CHILD_EXEC_FAILED,
CHILD_OPEN_FAILED,
CHILD_DUP2_FAILED, CHILD_DUP2_FAILED,
CHILD_FORK_FAILED CHILD_FORK_FAILED
}; };
@ -1674,7 +1675,7 @@ do_exec (gint child_err_report_fd,
gint read_null = safe_open ("/dev/null", O_RDONLY); gint read_null = safe_open ("/dev/null", O_RDONLY);
if (read_null < 0) if (read_null < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_OPEN_FAILED);
if (safe_dup2 (read_null, 0) < 0) if (safe_dup2 (read_null, 0) < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_DUP2_FAILED);
@ -1696,7 +1697,7 @@ do_exec (gint child_err_report_fd,
gint write_null = safe_open ("/dev/null", O_WRONLY); gint write_null = safe_open ("/dev/null", O_WRONLY);
if (write_null < 0) if (write_null < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_OPEN_FAILED);
if (safe_dup2 (write_null, 1) < 0) if (safe_dup2 (write_null, 1) < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_DUP2_FAILED);
@ -1718,7 +1719,7 @@ do_exec (gint child_err_report_fd,
gint write_null = safe_open ("/dev/null", O_WRONLY); gint write_null = safe_open ("/dev/null", O_WRONLY);
if (write_null < 0) if (write_null < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_OPEN_FAILED);
if (safe_dup2 (write_null, 2) < 0) if (safe_dup2 (write_null, 2) < 0)
write_err_and_exit (child_err_report_fd, write_err_and_exit (child_err_report_fd,
CHILD_DUP2_FAILED); CHILD_DUP2_FAILED);
@ -2518,6 +2519,14 @@ fork_exec (gboolean intermediate_child,
break; break;
case CHILD_OPEN_FAILED:
g_set_error (error,
G_SPAWN_ERROR,
G_SPAWN_ERROR_FAILED,
_("Failed to open file to remap file descriptor (%s)"),
g_strerror (buf[1]));
break;
case CHILD_DUP2_FAILED: case CHILD_DUP2_FAILED:
g_set_error (error, g_set_error (error,
G_SPAWN_ERROR, G_SPAWN_ERROR,