fix: correct error while parsing args of subCommand 'run' and 'kill'

Signed-off-by: ComixHe <heyuming@deepin.org>
OpenAtom-Linyaps · Dec 2, 2024 · a2d08e5 · a2d08e5
1 parent 44c9b61
commit a2d08e5
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/apps/ll-box/src/main.cpp b/apps/ll-box/src/main.cpp
@@ -340,9 +340,14 @@ int kill(const arg_kill &arg) noexcept
 
         // TODO: maybe use a more efficient way
         bool parsed{ false };
-        auto sigView = std::string_view{ arg.signal };
-        for (int i = 0; i < NSIG; ++i) {
-            if (::strsignal(i) == sigView) {
+        auto sigView = std::string_view{ arg.signal }.substr(3);
+        for (int i = SIGINT; i < NSIG; ++i) {
+            const auto *sigName = ::sigabbrev_np(i);
+            if (sigName == nullptr) {
+                continue;
+            }
+
+            if (sigName == sigView) {
                 sig = i;
                 parsed = true;
                 break;
@@ -532,12 +537,11 @@ arg_run subCommand_run(struct argp_state *state)
     argv[0] = argv0; // NOLINT
     state->next += argc - 1;
 
-    if (argv[state->next] == nullptr) {                              // NOLINT
+    if (state->argv[state->next] == nullptr) {                       // NOLINT
         argp_failure(state, -1, EINVAL, "container id must be set"); // NOLINT
     }
-    run_arg.container = argv[state->next]; // NOLINT
+    run_arg.container = state->argv[state->next++]; // NOLINT
 
-    state->next += argc;
     return run_arg;
 }