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

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

diff --git a/builtins/trap.def b/builtins/trap.def
index 8bba165d245a85742738b96f1d4153cf8e37b501..8503035c94596beb4689346d84ced88a189c826a 100644 (file)
--- a/builtins/trap.def
+++ b/builtins/trap.def
@@ -79,7 +79,7 @@ static int display_traps ();
 #define REVERT 1               /* Revert to this signals original value. */
 #define IGNORE 2               /* Ignore this signal. */
 
-extern int interactive;
+extern int interactive, posixly_correct;
 
 int
 trap_builtin (list)
@@ -201,12 +201,19 @@ showtrap (i)
   if (p == (char *)DEFAULT_SIG)
     return;
 
-  t = (p == (char *)IGNORE_SIG) ? (char *)NULL : single_quote (p);
+  t = (p == (char *)IGNORE_SIG) ? (char *)NULL : sh_single_quote (p);
   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 if (posixly_correct)
+    {
+      if (STREQN (sn, "SIG", 3))
+       printf ("trap -- %s %s\n", t ? t : "''", sn+3);
+      else
+       printf ("trap -- %s %s\n", t ? t : "''", sn);
+    }
   else
     printf ("trap -- %s %s\n", t ? t : "''", sn);