github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ParseSignal: drop add'l check for numeric signals

Browse Source 
The kernel will return an error anyway.

Drop the test case as well.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-03-17 09:28:11 -07:00
parent 5ebd0e5d0f
commit 5ef66e48f2
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
signals_test.go
View File

@ -31,7 +31,6 @@ func TestParseSignal(t *testing.T) {
{"1", syscall.Signal(1), false}, {"1", syscall.Signal(1), false},
{"SIGKILL", syscall.SIGKILL, false}, {"SIGKILL", syscall.SIGKILL, false},
{"NONEXIST", 0, true}, {"NONEXIST", 0, true},
{"65536", 0, true},
} }
for _, ts := range testSignals { for _, ts := range testSignals {
t.Run(fmt.Sprintf("%s/%d/%t", ts.raw, ts.want, ts.err), func(t *testing.T) { t.Run(fmt.Sprintf("%s/%d/%t", ts.raw, ts.want, ts.err), func(t *testing.T) {

6
signals_unix.go
View File

@ -33,11 +33,7 @@ import (
func ParseSignal(rawSignal string) (syscall.Signal, error) { func ParseSignal(rawSignal string) (syscall.Signal, error) {
s, err := strconv.Atoi(rawSignal) s, err := strconv.Atoi(rawSignal)
if err == nil { if err == nil {
signal := syscall.Signal(s) return syscall.Signal(s), nil
if unix.SignalName(signal) != "" {
return signal, nil
}
return -1, fmt.Errorf("unknown signal %q", rawSignal)
} }
signal := unix.SignalNum(strings.ToUpper(rawSignal)) signal := unix.SignalNum(strings.ToUpper(rawSignal))
if signal == 0 { if signal == 0 {