mirror of
https://github.com/postgres/postgres.git
synced 2025-09-03 15:22:11 +03:00
c6d43ffab3
This commit back-patches the v12-era commitsa73d08319,cc92cca43, and7570df0f3into supported pre-v12 branches. The net effect is to eliminate our former dependency on the never-standard sys_siglist[] array, instead using POSIX-standard strsignal(3). What motivates doing this now is that glibc just removed sys_siglist[] from the set of symbols available to newly-built programs. While our code can survive without sys_siglist[], it then fails to print any description of the signal that killed a child process, which is a non-negligible loss of friendliness. We can expect that people will be wanting to build the back branches on platforms that include this change, so we need to do something. Since strsignal(3) has existed for quite a long time, and we've not had any trouble with these patches so far in v12, it seems safe to back-patch into older branches. Discussion: https://postgr.es/m/3179114.1594853308@sss.pgh.pa.us
120 lines
3.2 KiB
C
120 lines
3.2 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* wait_error.c
|
|
* Convert a wait/waitpid(2) result code to a human-readable string
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
*
|
|
* IDENTIFICATION
|
|
* src/common/wait_error.c
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef FRONTEND
|
|
#include "postgres.h"
|
|
#else
|
|
#include "postgres_fe.h"
|
|
#endif
|
|
|
|
#include <signal.h>
|
|
#include <sys/wait.h>
|
|
|
|
/*
|
|
* Return a human-readable string explaining the reason a child process
|
|
* terminated. The argument is a return code returned by wait(2) or
|
|
* waitpid(2). The result is a translated, palloc'd or malloc'd string.
|
|
*/
|
|
char *
|
|
wait_result_to_str(int exitstatus)
|
|
{
|
|
char str[512];
|
|
|
|
if (WIFEXITED(exitstatus))
|
|
{
|
|
/*
|
|
* Give more specific error message for some common exit codes that
|
|
* have a special meaning in shells.
|
|
*/
|
|
switch (WEXITSTATUS(exitstatus))
|
|
{
|
|
case 126:
|
|
snprintf(str, sizeof(str), _("command not executable"));
|
|
break;
|
|
|
|
case 127:
|
|
snprintf(str, sizeof(str), _("command not found"));
|
|
break;
|
|
|
|
default:
|
|
snprintf(str, sizeof(str),
|
|
_("child process exited with exit code %d"),
|
|
WEXITSTATUS(exitstatus));
|
|
}
|
|
}
|
|
else if (WIFSIGNALED(exitstatus))
|
|
{
|
|
#if defined(WIN32)
|
|
snprintf(str, sizeof(str),
|
|
_("child process was terminated by exception 0x%X"),
|
|
WTERMSIG(exitstatus));
|
|
#else
|
|
snprintf(str, sizeof(str),
|
|
_("child process was terminated by signal %d: %s"),
|
|
WTERMSIG(exitstatus), pg_strsignal(WTERMSIG(exitstatus)));
|
|
#endif
|
|
}
|
|
else
|
|
snprintf(str, sizeof(str),
|
|
_("child process exited with unrecognized status %d"),
|
|
exitstatus);
|
|
|
|
return pstrdup(str);
|
|
}
|
|
|
|
/*
|
|
* Return true if a wait(2) result indicates that the child process
|
|
* died due to the specified signal.
|
|
*
|
|
* The reason this is worth having a wrapper function for is that
|
|
* there are two cases: the signal might have been received by our
|
|
* immediate child process, or there might've been a shell process
|
|
* between us and the child that died. The shell will, per POSIX,
|
|
* report the child death using exit code 128 + signal number.
|
|
*
|
|
* If there is no possibility of an intermediate shell, this function
|
|
* need not (and probably should not) be used.
|
|
*/
|
|
bool
|
|
wait_result_is_signal(int exit_status, int signum)
|
|
{
|
|
if (WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum)
|
|
return true;
|
|
if (WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == 128 + signum)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Return true if a wait(2) result indicates that the child process
|
|
* died due to any signal. We consider either direct child death
|
|
* or a shell report of child process death as matching the condition.
|
|
*
|
|
* If include_command_not_found is true, also return true for shell
|
|
* exit codes indicating "command not found" and the like
|
|
* (specifically, exit codes 126 and 127; see above).
|
|
*/
|
|
bool
|
|
wait_result_is_any_signal(int exit_status, bool include_command_not_found)
|
|
{
|
|
if (WIFSIGNALED(exit_status))
|
|
return true;
|
|
if (WIFEXITED(exit_status) &&
|
|
WEXITSTATUS(exit_status) > (include_command_not_found ? 125 : 128))
|
|
return true;
|
|
return false;
|
|
}
|