summaryrefslogtreecommitdiff
path: root/src/port/exec.c
diff options
context:
space:
mode:
authorTom Lane2007-01-28 06:32:03 +0000
committerTom Lane2007-01-28 06:32:03 +0000
commita9fa52504f75d5297d33712aca27f1c1b01adab8 (patch)
tree6b35726af23bc594dcd978f419bcf81595cdacf5 /src/port/exec.c
parent91ed399517b025ff672d57599a6155350cd84a89 (diff)
Clean up broken usage of HAVE_DECL_SYS_SIGLIST and inconsistent/poorly
formatted error messages.
Diffstat (limited to 'src/port/exec.c')
-rw-r--r--src/port/exec.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/port/exec.c b/src/port/exec.c
index 5d7a8f052a7..47c1f15b40b 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/exec.c,v 1.51 2007/01/28 03:50:34 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.52 2007/01/28 06:32:02 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -584,12 +584,13 @@ pclose_check(FILE *stream)
WEXITSTATUS(exitstatus));
else if (WIFSIGNALED(exitstatus))
#if defined(WIN32)
- log_error(_("child process was terminated by exception %X\nSee C include file \"ntstatus.h\" for a description of the hex value."),
+ log_error(_("child process was terminated by exception 0x%X"),
+ WTERMSIG(exitstatus));
+#elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST
+ log_error(_("child process was terminated by signal %s (%d)"),
+ WTERMSIG(exitstatus) < NSIG ?
+ sys_siglist[WTERMSIG(exitstatus)] : "(unknown)",
WTERMSIG(exitstatus));
-#elif defined(HAVE_DECL_SYS_SIGLIST)
- log_error(_("child process was terminated by signal: %s"),
- WTERMSIG(exitstatus) < NSIG ?
- sys_siglist[WTERMSIG(exitstatus)] : "unknown signal");
#else
log_error(_("child process was terminated by signal %d"),
WTERMSIG(exitstatus));