From 2a2347b5bd265d034565b20ccd8388c74b96dbd5 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 21 May 2017 17:51:01 +0000 Subject: [PATCH] Rename sys_sig[gs]etmask to sys_s[gs]etmask to match syscall names * signal.c (SYS_FUNC(sigsetmask)): Rename to SYS_FUNC(ssetmask). (SYS_FUNC(siggetmask)): Rename to SYS_FUNC(sgetmask). * linux/arm/syscallent.h (sgetmask, ssetmask): Update sys_func. * linux/bfin/syscallent.h: Likewise. * linux/crisv10/syscallent.h: Likewise. * linux/hppa/syscallent.h: Likewise. * linux/i386/syscallent.h: Likewise. * linux/m68k/syscallent.h: Likewise. * linux/microblaze/syscallent.h: Likewise. * linux/mips/syscallent-o32.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/powerpc64/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/sparc64/syscallent.h: Likewise. --- linux/arm/syscallent.h | 4 ++-- linux/bfin/syscallent.h | 4 ++-- linux/crisv10/syscallent.h | 4 ++-- linux/hppa/syscallent.h | 4 ++-- linux/i386/syscallent.h | 4 ++-- linux/m68k/syscallent.h | 4 ++-- linux/microblaze/syscallent.h | 4 ++-- linux/mips/syscallent-o32.h | 4 ++-- linux/powerpc/syscallent.h | 4 ++-- linux/powerpc64/syscallent.h | 4 ++-- linux/sh/syscallent.h | 4 ++-- linux/sh64/syscallent.h | 4 ++-- linux/sparc/syscallent.h | 4 ++-- linux/sparc64/syscallent.h | 4 ++-- signal.c | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 8e47e642..f9e7dbd4 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index ec51f6c9..9be23d9d 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/crisv10/syscallent.h b/linux/crisv10/syscallent.h index c384a8bc..0e36774c 100644 --- a/linux/crisv10/syscallent.h +++ b/linux/crisv10/syscallent.h @@ -66,8 +66,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index 59d75a6b..ccff2a4c 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -70,8 +70,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 2, TF, SEN(pivotroot), "pivot_root" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid), "setreuid" }, [ 71] = { 2, 0, SEN(setregid), "setregid" }, [ 72] = { 3, TM, SEN(mincore), "mincore" }, diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 27c11b66..332c6b8b 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index 449919be..afda5e73 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index a0c609ec..3731acfc 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 3, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h index c4752514..9b84c483 100644 --- a/linux/mips/syscallent-o32.h +++ b/linux/mips/syscallent-o32.h @@ -68,8 +68,8 @@ [4065] = { 0, 0, SEN(getpgrp), "getpgrp" }, [4066] = { 0, 0, SEN(setsid), "setsid" }, [4067] = { 3, TS, SEN(sigaction), "sigaction" }, -[4068] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[4069] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[4068] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[4069] = { 1, TS, SEN(ssetmask), "ssetmask" }, [4070] = { 2, 0, SEN(setreuid), "setreuid" }, [4071] = { 2, 0, SEN(setregid), "setregid" }, [4072] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 69c2ac18..b3c4c2bc 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid), "setreuid" }, [ 71] = { 2, 0, SEN(setregid), "setregid" }, [ 72] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h index ce99ae62..3ce89c13 100644 --- a/linux/powerpc64/syscallent.h +++ b/linux/powerpc64/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid), "setreuid" }, [ 71] = { 2, 0, SEN(setregid), "setregid" }, [ 72] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 072aea28..f0a643b1 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -96,8 +96,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 043c20e6..5637fb42 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -94,8 +94,8 @@ [ 65] = { 0, 0, SEN(getpgrp), "getpgrp" }, [ 66] = { 0, 0, SEN(setsid), "setsid" }, [ 67] = { 3, TS, SEN(sigaction), "sigaction" }, -[ 68] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[ 69] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[ 68] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[ 69] = { 1, TS, SEN(ssetmask), "ssetmask" }, [ 70] = { 2, 0, SEN(setreuid16), "setreuid" }, [ 71] = { 2, 0, SEN(setregid16), "setregid" }, [ 72] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index c64b4461..3fb40ec7 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -197,8 +197,8 @@ [196] = { 3, 0, SEN(ioprio_set), "ioprio_set" }, [197] = { 0, NF, SEN(getppid), "getppid" }, [198] = { 3, TS, SEN(sigaction), "sigaction" }, -[199] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[200] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[199] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[200] = { 1, TS, SEN(ssetmask), "ssetmask" }, [201] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, [202] = { 2, TF|TLST|TSTA, SEN(lstat), "oldlstat" }, [203] = { 1, TF, SEN(uselib), "uselib" }, diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h index b0308a55..9706425d 100644 --- a/linux/sparc64/syscallent.h +++ b/linux/sparc64/syscallent.h @@ -195,8 +195,8 @@ [196] = { 3, 0, SEN(ioprio_set), "ioprio_set" }, [197] = { 0, NF, SEN(getppid), "getppid" }, [198] = { 3, TS, SEN(sigaction), "sigaction" }, -[199] = { 0, TS, SEN(siggetmask), "sgetmask" }, -[200] = { 1, TS, SEN(sigsetmask), "ssetmask" }, +[199] = { 0, TS, SEN(sgetmask), "sgetmask" }, +[200] = { 1, TS, SEN(ssetmask), "ssetmask" }, [201] = { 1, TS, SEN(sigsuspend), "sigsuspend" }, [202] = { 2, TF|TLST|TSTA, SEN(lstat), "oldlstat" }, [203] = { 1, TF, SEN(uselib), "uselib" }, diff --git a/signal.c b/signal.c index 321b507a..88856b57 100644 --- a/signal.c +++ b/signal.c @@ -285,7 +285,7 @@ print_sigset_addr(struct tcb *const tcp, const kernel_ulong_t addr) print_sigset_addr_len_limit(tcp, addr, NSIG_BYTES, NSIG_BYTES); } -SYS_FUNC(sigsetmask) +SYS_FUNC(ssetmask) { if (entering(tcp)) { tprintsigmask_val("", tcp->u_arg[0]); @@ -393,7 +393,7 @@ SYS_FUNC(signal) return 0; } -SYS_FUNC(siggetmask) +SYS_FUNC(sgetmask) { if (exiting(tcp)) { tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval); -- 2.40.0