mirror of
https://github.com/containers/podman.git
synced 2025-11-02 06:37:09 +08:00
0f7d54b026
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
42 lines
1.0 KiB
Go
42 lines
1.0 KiB
Go
package signal
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"syscall"
|
|
)
|
|
|
|
// ParseSignal translates a string to a valid syscall signal.
|
|
// It returns an error if the signal map doesn't include the given signal.
|
|
func ParseSignal(rawSignal string) (syscall.Signal, error) {
|
|
s, err := strconv.Atoi(rawSignal)
|
|
if err == nil {
|
|
if s == 0 {
|
|
return -1, fmt.Errorf("invalid signal: %s", rawSignal)
|
|
}
|
|
return syscall.Signal(s), nil
|
|
}
|
|
sig, ok := signalMap[strings.TrimPrefix(strings.ToUpper(rawSignal), "SIG")]
|
|
if !ok {
|
|
return -1, fmt.Errorf("invalid signal: %s", rawSignal)
|
|
}
|
|
return sig, nil
|
|
}
|
|
|
|
// ParseSignalNameOrNumber translates a string to a valid syscall signal. Input
|
|
// can be a name or number representation i.e. "KILL" "9"
|
|
func ParseSignalNameOrNumber(rawSignal string) (syscall.Signal, error) {
|
|
basename := strings.TrimPrefix(rawSignal, "-")
|
|
s, err := ParseSignal(basename)
|
|
if err == nil {
|
|
return s, nil
|
|
}
|
|
for k, v := range signalMap {
|
|
if strings.EqualFold(k, basename) {
|
|
return v, nil
|
|
}
|
|
}
|
|
return -1, fmt.Errorf("invalid signal: %s", basename)
|
|
}
|