← Commit list

e74aaf938

Denys Vlasenko
Denys Vlasenko
2009-09-27
FAILED Duration: 30s

Subject

ash,hush: make trap output short signal names, without SIG prefix

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash.c +6 -3shell/ash_test/ash-signals/savetrap.right +3 -3shell/ash_test/ash-signals/signal1.right +5 -5shell/hush.c +5 -2shell/hush_test/hush-trap/savetrap.right +3 -3shell/hush_test/hush-trap/usage.right +6 -6
shell/ash.c+6 -3
@@ -12267,13 +12267,16 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
for (signo = 0; signo < NSIG; signo++) {
char *tr = trap_ptr[signo];
if (tr) {
- out1fmt("trap -- %s %s%s\n",
+ /* note: bash adds "SIG", but only if invoked
+ * as "bash". If called as "sh", or if set -o posix,
+ * then it prints short signal names.
+ * We are printing short names: */
+ out1fmt("trap -- %s %s\n",
single_quote(tr),
- (signo == 0 ? "" : "SIG"),
get_signame(signo));
/* trap_ptr != trap only if we are in special-cased `trap` code.
* In this case, we will exit very soon, no need to free(). */
- /* if (trap_ptr != trap) */
+ /* if (trap_ptr != trap && tp[0]) */
/* free(tr); */
}
}
shell/ash_test/ash-signals/savetrap.right+3 -3
@@ -1,8 +1,8 @@
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
Done
Exiting
shell/ash_test/ash-signals/signal1.right+5 -5
@@ -1,20 +1,20 @@
got signal
-trap -- 'echo got signal' SIGUSR1
+trap -- 'echo got signal' USR1
sent 1 signal
got signal
wait interrupted
-trap -- 'echo got signal' SIGUSR1
+trap -- 'echo got signal' USR1
sent 2 signal
got signal
wait interrupted
-trap -- 'echo got signal' SIGUSR1
+trap -- 'echo got signal' USR1
sent 3 signal
got signal
wait interrupted
-trap -- 'echo got signal' SIGUSR1
+trap -- 'echo got signal' USR1
sent 4 signal
got signal
wait interrupted
-trap -- 'echo got signal' SIGUSR1
+trap -- 'echo got signal' USR1
sent 5 signal
sleep completed
shell/hush.c+5 -2
@@ -7111,8 +7111,11 @@ static int FAST_FUNC builtin_trap(char **argv)
if (G.traps[i]) {
printf("trap -- ");
print_escaped(G.traps[i]);
- /* bash compat: it says SIGxxx, not just xxx */
- printf(" %s%s\n", i == 0 ? "" : "SIG", get_signame(i));
+ /* note: bash adds "SIG", but only if invoked
+ * as "bash". If called as "sh", or if set -o posix,
+ * then it prints short signal names.
+ * We are printing short names: */
+ printf(" %s\n", get_signame(i));
}
}
/*fflush(stdout); - done after each builtin anyway */
shell/hush_test/hush-trap/savetrap.right+3 -3
@@ -1,8 +1,8 @@
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
trap -- 'echo Exiting' EXIT
-trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' WINCH
Done
Exiting
shell/hush_test/hush-trap/usage.right+6 -6
@@ -2,13 +2,13 @@ ___
___
___
trap -- 'a' EXIT
-trap -- 'a' SIGINT
-trap -- 'a' SIGUSR1
-trap -- 'a' SIGUSR2
+trap -- 'a' INT
+trap -- 'a' USR1
+trap -- 'a' USR2
___
___
-trap -- 'a' SIGUSR1
-trap -- 'a' SIGUSR2
+trap -- 'a' USR1
+trap -- 'a' USR2
___
___
-trap -- 'a' SIGUSR2
+trap -- 'a' USR2