Imported from ../bash-2.01.1.tar.gz.

[thirdparty/bash.git] / builtins / trap.def

diff --git a/builtins/trap.def b/builtins/trap.def
index 2d5daca7c60c290a57503e62efedb77bde4b4ae0..252a1dbeb51380ad79cd979d50987d5dc99b7e94 100644 (file)
--- a/builtins/trap.def
+++ b/builtins/trap.def
@@ -191,7 +191,7 @@ static void
 showtrap (i)
      int i;
 {
-  char *t, *p;
+  char *t, *p, *sn;
 
   p = trap_list[i];
 
@@ -199,9 +199,15 @@ showtrap (i)
     return;
 
   t = (p == (char *)IGNORE_SIG) ? (char *)NULL : single_quote (p);
-  printf ("trap -- %s %s\n", t ? t : "''", signal_name (i));
-  if (t)
-    free (t);
+  sn = signal_name (i);
+  /* Make sure that signals whose names are unknown (for whatever reason)
+     are printed as signal numbers. */
+  if (STREQN (sn, "SIGJUNK", 7) || STREQN (sn, "unknown", 7))
+    printf ("trap -- %s %d\n", t ? t : "''", i);
+  else
+    printf ("trap -- %s %s\n", t ? t : "''", sn);
+
+  FREE (t);
 }
 
 static int