glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use printsignal instead of signame

Browse Source 
As the former respects xlat styles while the latter doesn't.

* clone.c (SYS_FUNC(clone)): Use printsignal for printing termination
signal in printflags.
* fcntl.c (print_fcntl) <case F_SETSIG>: Use printsignal.
* prctl.c (SYS_FUNC(prctl)) <case PR_GET_PDEATHSIG,
case PR_SET_PDEATHSIG>: Likewise.
* print_sigevent.c (print_sigevent): Likewise.
* s390.c (s390_runtime_instr): Likewise.
* signal.c (SYS_FUNC(kill), SYS_FUNC(tgkill)): Likewise.
This commit is contained in:
Eugene Syromyatnikov 2018-10-07 05:12:42 +02:00 committed by Dmitry V. Levin
parent 8c3b410bac
commit b3f92b39f1
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clone.c
View File

@ -91,8 +91,10 @@ SYS_FUNC(clone)
tprints("flags="); tprints("flags=");
if (!printflags64(clone_flags, flags & ~CSIGNAL, NULL)) if (!printflags64(clone_flags, flags & ~CSIGNAL, NULL))
sep = ""; sep = "";
if ((flags & CSIGNAL) != 0) if ((flags & CSIGNAL) != 0) {
tprintf("%s%s", sep, signame(flags & CSIGNAL)); tprints(sep);
printsignal(flags & CSIGNAL);
}
if ((flags & (CLONE_PARENT_SETTID|CLONE_CHILD_SETTID if ((flags & (CLONE_PARENT_SETTID|CLONE_CHILD_SETTID
|CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0) |CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0)
return 0; return 0;

2
fcntl.c
View File

@ -114,7 +114,7 @@ print_fcntl(struct tcb *tcp)
break; break;
case F_SETSIG: case F_SETSIG:
tprints(", "); tprints(", ");
tprints(signame(tcp->u_arg[2])); printsignal(tcp->u_arg[2]);
break; break;
case F_GETOWN: case F_GETOWN:
case F_GETPIPE_SZ: case F_GETPIPE_SZ:

4
prctl.c
View File

@ -141,7 +141,7 @@ SYS_FUNC(prctl)
tprints(", "); tprints(", ");
} else if (!umove_or_printaddr(tcp, arg2, &i)) { } else if (!umove_or_printaddr(tcp, arg2, &i)) {
tprints("["); tprints("[");
tprints(signame(i)); printsignal(i);
tprints("]"); tprints("]");
} }
break; break;
@ -318,7 +318,7 @@ SYS_FUNC(prctl)
if (arg2 > 128) if (arg2 > 128)
tprintf("%" PRI_klu, arg2); tprintf("%" PRI_klu, arg2);
else else
tprints(signame(arg2)); printsignal(arg2);
return RVAL_DECODED; return RVAL_DECODED;
case PR_SET_PTRACER: case PR_SET_PTRACER:

2
print_sigevent.c
View File

@ -36,7 +36,7 @@ MPERS_PRINTER_DECL(void, print_sigevent,
case SIGEV_SIGNAL: case SIGEV_SIGNAL:
case SIGEV_THREAD: case SIGEV_THREAD:
case SIGEV_THREAD_ID: case SIGEV_THREAD_ID:
tprints(signame(sev.sigev_signo)); printsignal(sev.sigev_signo);
break; break;
default: default:
tprintf("%u", sev.sigev_signo); tprintf("%u", sev.sigev_signo);

2
s390.c
View File

@ -1197,7 +1197,7 @@ SYS_FUNC(s390_runtime_instr)
switch (command) { switch (command) {
case S390_RUNTIME_INSTR_START: case S390_RUNTIME_INSTR_START:
tprints(", "); tprints(", ");
tprints(signame(signum)); printsignal(signum);
break; break;
case S390_RUNTIME_INSTR_STOP: case S390_RUNTIME_INSTR_STOP:

15
signal.c
View File

@ -442,19 +442,20 @@ SYS_FUNC(sigprocmask)
SYS_FUNC(kill) SYS_FUNC(kill)
{ {
tprintf("%d, %s", /* pid */
(int) tcp->u_arg[0], tprintf("%d, ", (int) tcp->u_arg[0]);
signame(tcp->u_arg[1])); /* signal */
printsignal(tcp->u_arg[1]);
return RVAL_DECODED; return RVAL_DECODED;
} }
SYS_FUNC(tgkill) SYS_FUNC(tgkill)
{ {
tprintf("%d, %d, %s", /* tgid, tid */
(int) tcp->u_arg[0], tprintf("%d, %d, ", (int) tcp->u_arg[0], (int) tcp->u_arg[1]);
(int) tcp->u_arg[1], /* signal */
signame(tcp->u_arg[2])); printsignal(tcp->u_arg[2]);
return RVAL_DECODED; return RVAL_DECODED;
} }