From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 42740385E017 for ; Wed, 25 Mar 2020 13:33:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 42740385E017 Received: by mail-qt1-x844.google.com with SMTP id x16so2061174qts.11 for ; Wed, 25 Mar 2020 06:33:44 -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=EXLvYjoD9X0m3s9aEivPRpacD0t7qGOjrfPPwIXBqY4=; b=XpWpPCiX9lnp3rWujZYEtr6d09kSDIj9dmuN+4lHCyMLp3oi1wyfn6rdwXIG+5Bm98 S6Me14XjX787SYPr2LBYPIDodfzIKdBT/9c6TauaDPqlqAspn5dKgVL1NVAylMr4UWzN wXz81F/wPzrGDXv2qW5oORC214wE1EDg9iCxTo3xOAh5489XAVa5pfv9Pw1+vWpX3aF9 dM7znTGqtIKzyzV+QRMNSxJnMnRLMlkbmhlEnm8DsnmHt68Ls8ZUDIzpvxVa/twJevcD Yh84ttu1l+5X/ByFYlPiQV6ExQbZr6cAdyYnOQbsDTIJy5cqL+EkQ0NPMno/HmVqd5bQ SELA== X-Gm-Message-State: ANhLgQ2g9UoWSSq568ObgWDh2sOwi7PUQxbSdUUDIuj/yUs3znJMb7gw HDyb2gKB6mCiP34zuUwBqpE2daXwJAU= X-Google-Smtp-Source: ADFU+vt9IzZWLeWhrDPbUIkx3LmOA4KV+m15xM4Yx7qEEvR3ZMJ4pfcUejtEoHetNxvYWm0ZwN6Wbg== X-Received: by 2002:aed:36a5:: with SMTP id f34mr2768043qtb.57.1585143223424; Wed, 25 Mar 2020 06:33:43 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z18sm17520373qtz.77.2020.03.25.06.33.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 06:33:43 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [2.30 COMMITTED] support/shell-container.c: Add builtin kill Date: Wed, 25 Mar 2020 10:33:35 -0300 Message-Id: <20200325133336.2530718-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200325133336.2530718-1-adhemerval.zanella@linaro.org> References: <20200325133336.2530718-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-26.0 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 13:33:45 -0000 No options supported. Reviewed-by: DJ Delorie (cherry picked from commit 1c17100c43c0913ec94f3bcc966bf3792236c690) --- support/shell-container.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/support/shell-container.c b/support/shell-container.c index 99a0ff7ca5..51b01dce0d 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); } -- 2.17.1