From patchwork Tue Mar 24 18:50:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 38608 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by sourceware.org (Postfix) with ESMTPS id DC9ED385E01B for ; Tue, 24 Mar 2020 18:50:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DC9ED385E01B Received: by mail-qk1-x743.google.com with SMTP id x3so8904468qki.4 for ; Tue, 24 Mar 2020 11:50:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BOBpyUu4k1ggqOMZsWUCABKbjZXcXa/uexvDUvSb8Tg=; b=dG/04tI3o3c6VUb0LNZ6nlOrWA0sGNynUzN6brQ6HITiXbu1b7MUQ0NP7JC+70J8ZT 0XzSsy279WEGsHnSjvriKJOm+LIV3sLz0u1FoR8T879QUjK5OzBbJ0OInvQgsjpvZjOn q/rCrQeWqAPSFAF4q2oOS8U5BZk86PZApYF8NblpED9GIa6aELnivo1NuA2oYFaMRdN5 CQM1aXv2k3+pADEYaxArdCFl3cULQTiNBWou/7zy0x2D4XSrkocNkqipQzsJk/d8b37L K37QmAzT1mTDTTxLtrl8Hu7KnVGcF2OgQSkW5wLk0+Wvy/CVoWUYWTe1EVVsDBNETH0D djUQ== X-Gm-Message-State: ANhLgQ0yb7XAkpge8X1f71H+AUEpvnm29zlHZ8zMUqLqzcm/TuHjVLzE 7zHfg9LP2P8vdeCCACge8YRfFRHW6TQ= X-Google-Smtp-Source: ADFU+vuVqaJfjUsT86BreUv2gYngTHr9JmZOhADaU2+4KntfYHFp8ZdV0Ns+LFKiChihMc4ZDtSNDQ== X-Received: by 2002:ae9:dd85:: with SMTP id r127mr18540101qkf.58.1585075852307; Tue, 24 Mar 2020 11:50:52 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 69sm13704216qki.131.2020.03.24.11.50.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 11:50:51 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/4] support/shell-container.c: Add builtin kill Date: Tue, 24 Mar 2020 15:50:42 -0300 Message-Id: <20200324185043.2073568-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324185043.2073568-1-adhemerval.zanella@linaro.org> References: <20200324185043.2073568-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-27.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 18:50:54 -0000 No options supported. --- support/shell-container.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/support/shell-container.c b/support/shell-container.c index d405eda60e..e926e74abe 100644 --- a/support/shell-container.c +++ b/support/shell-container.c @@ -147,6 +147,25 @@ exit_func (char **argv) return 0; } +/* Emulate the "/bin/kill" command. Options are ignored. */ +static int +kill_func (char **argv) +{ + int signum = SIGTERM; + int i; + + for (i = 0; argv[i]; i++) + { + pid_t pid; + if (strcmp (argv[i], "$$") == 0) + pid = getpid (); + else + pid = atoi (argv[i]); + kill (pid, signum); + } + return 0; +} + /* This is a list of all the built-in commands we understand. */ static struct { const char *name; @@ -156,6 +175,7 @@ static struct { { "echo", echo_func }, { "cp", copy_func }, { "exit", exit_func }, + { "kill", kill_func }, { NULL, NULL } }; @@ -264,6 +284,11 @@ run_command_array (char **argv) if (rv) exit (rv); } + else if (WIFSIGNALED (status)) + { + int sig = WTERMSIG (status); + raise (sig); + } else exit (1); }