From patchwork Tue Mar 24 18:50:40 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: 38606 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by sourceware.org (Postfix) with ESMTPS id E6FFF385E003 for ; Tue, 24 Mar 2020 18:50:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E6FFF385E003 Received: by mail-qv1-xf30.google.com with SMTP id p60so9797649qva.5 for ; Tue, 24 Mar 2020 11:50:49 -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; bh=ihNWdTsS9S4+005HJHU1pdN8w8do2+XhTXAJVPxtOq4=; b=ar5MuW7FGEd50sseVv6NKdKzf5cuPufvukL/KEwZ20xRZraY9nFTvG3gK2Hb/x4MaV lFJV27oNKBUzTqnJxRG0jpyiuLub1Hpen6ghVdDqZe1ZssSBXbxiWwC+jCNup1agz64s QrPiu4lCTua6QpAHQVe3gUMIKE0PebKvXuOF1Q0GJ+lthF0QG3pkFQWx6xvAFWNXxNK0 GDDHqt/73831rpqtsZzSspzGWwqVoQPE8cmxLiMGRmxEfIA8LU+kBKGLDk4EJROoijPd l5w3J/gV/UkY3jZ0hfN3ZDgM8DOdyLSZ8el25lEnl7RVJ5dBEkuYAwz+fcn3Zo9zFFOY 6aRw== X-Gm-Message-State: ANhLgQ2GjDwB5StSDtBzMmtmGwPI8TqHt4uvR8JIdQExRopzHz6ck7Hn cSBcLHOiGqKBDtMxhra46zydPa08jaE= X-Google-Smtp-Source: ADFU+vsLLS33ltzvuwywL70PNEgFJXu/EQEnV2NP9wZIjFtnjJnIbFDg4Vo7k54OL0LWXpm3BRb6hA== X-Received: by 2002:a05:6214:364:: with SMTP id t4mr22667042qvu.124.1585075849223; Tue, 24 Mar 2020 11:50:49 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 69sm13704216qki.131.2020.03.24.11.50.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 11:50:48 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 1/4] support/shell-container.c: Return 127 if execve fails Date: Tue, 24 Mar 2020 15:50:40 -0300 Message-Id: <20200324185043.2073568-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-27.4 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:51 -0000 --- support/shell-container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/shell-container.c b/support/shell-container.c index 72950bcabf..d1112d4009 100644 --- a/support/shell-container.c +++ b/support/shell-container.c @@ -238,7 +238,7 @@ run_command_array (char **argv) fprintf (stderr, "sh: execing %s failed: %s", argv[0], strerror (errno)); - exit (1); + exit (127); } waitpid (pid, &status, 0); From patchwork Tue Mar 24 18:50:41 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: 38607 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 3608A385E00B for ; Tue, 24 Mar 2020 18:50:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3608A385E00B Received: by mail-qk1-x744.google.com with SMTP id x3so8904380qki.4 for ; Tue, 24 Mar 2020 11:50:51 -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=wWekmARKslYdzPHTbdgvuGqGqGbVIl6+30fF9Hn1tkc=; b=iKbCdfrDULCwMm1ABzLuxsCQa/JGBGVn10ASPWlmDhKEDzoSM2kKyN7FxazpIBE+Tq 6Kwz/lV3BwxBY2PDMRNe/N4b+XsYGiGpux2FZqmAIf+a30HknA+zJrY/JJ9pAlZqYiSl sh5SQVv3jAArcA8TLII3UppO1w+dfnkYBvlY0w4E6IgjHaeW8yEzni26F5lTDxnc6pbT 5uNxB64nygFAwCXaP0qZ1pVXYFZfUK011Dty9rIfVGZtCZ51mRyt7jpDZE4iPib+Mp91 id/YC7Ei5eNb1/GSiUH3IuahRSp/S+glHK+0oiiKB8ntKUzJMunKn6C/BT/qwzhbh1Rg ojJg== X-Gm-Message-State: ANhLgQ0HYNgdmZmo4XfQyepyFi/9p9t841smCS0MJMVIJgdLYKdQ2BoW 6XOzdx2KbylaLdAnFElgJecHrrUaOco= X-Google-Smtp-Source: ADFU+vsdi+7CHIGxjKW/iNNixJrt04isOZhMBi/Ouaajl5sS7Jry5knsWmw7KXBIAeLkqCEXKLFUcA== X-Received: by 2002:a37:d8a:: with SMTP id 132mr10306302qkn.270.1585075850579; Tue, 24 Mar 2020 11:50:50 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 69sm13704216qki.131.2020.03.24.11.50.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 11:50:50 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/4] support/shell-container.c: Add builtin exit Date: Tue, 24 Mar 2020 15:50:41 -0300 Message-Id: <20200324185043.2073568-2-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.5 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:52 -0000 --- support/shell-container.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/support/shell-container.c b/support/shell-container.c index d1112d4009..d405eda60e 100644 --- a/support/shell-container.c +++ b/support/shell-container.c @@ -135,6 +135,18 @@ copy_func (char **argv) } +/* Emulate the "/bin/exit" command. The exit value is optional. */ +static int +exit_func (char **argv) +{ + int exit_val = 0; + + if (argv[0] != 0) + exit_val = atoi (argv[0]) & 0xff; + exit (exit_val); + return 0; +} + /* This is a list of all the built-in commands we understand. */ static struct { const char *name; @@ -143,6 +155,7 @@ static struct { { "true", true_func }, { "echo", echo_func }, { "cp", copy_func }, + { "exit", exit_func }, { NULL, NULL } }; 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); } From patchwork Tue Mar 24 18:50:43 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: 38609 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 7EF07385E01B for ; Tue, 24 Mar 2020 18:50:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7EF07385E01B Received: by mail-qk1-x744.google.com with SMTP id b62so11093488qkf.6 for ; Tue, 24 Mar 2020 11:50:54 -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=3w1aKO1UhutItN+uRsUzM8fWXpj9sgtyNSbZX+8s7og=; b=HCvCDEDGaoKFiYOozNOU8lx950iHDb5EiN8k3ppkv1Kbuw8e8wVlKTC69C3nBZpnxK To1kQ35ozQdD6CWM44q4g4GwiF+6To0Q+U7wGe0glyCgWCa0c/XYSjDKiQME6NDGZHvi IT6oVVKYSuUY0xIcm3R9pljyuLj8ULyHgubQbylhfcJsGVj2+FmNNe7l1i9y4FrAsXQK J/1b0RgVBDDTk4gwByRApBQ+eY0mCqmljhJBvLTiC0ytpcQfoDsWojOCbmw9Pdx8ADXb JgfmSNuRc8tbBSWvaLwJoYO70TmtEcGSfubwVZtjq5CBk2ADabdYafhkAVydddWJDy7v Z+xg== X-Gm-Message-State: ANhLgQ30j5HxqNcyF+A+H1J6fqgy9T9Pw7Mgb5TgyPiYwGkNaYpyCYl9 9KH1h6W/YWFLIyl9MvWgUmJqwgLLQq8= X-Google-Smtp-Source: ADFU+vtBZ+gCrCRibAK3bE8GPwZxAQWh72R5iCaxu3ETXO+jHK6pgFF1iRUdnsbwTscZU59nNZ0ofw== X-Received: by 2002:a37:5b82:: with SMTP id p124mr27476310qkb.130.1585075853815; Tue, 24 Mar 2020 11:50:53 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 69sm13704216qki.131.2020.03.24.11.50.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 11:50:53 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/4] stdlib: Move tst-system to tests-container Date: Tue, 24 Mar 2020 15:50:43 -0300 Message-Id: <20200324185043.2073568-4-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.7 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:55 -0000 Fix some issues with different shell and error messages. Checked on x86_64-linux-gnu. --- stdlib/Makefile | 3 ++- stdlib/tst-system.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/stdlib/Makefile b/stdlib/Makefile index 45214b59e4..4615f6dfe7 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -70,7 +70,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ test-canon test-canon2 tst-strtoll tst-environ \ tst-xpg-basename tst-random tst-random2 tst-bsearch \ tst-limits tst-rand48 bug-strtod tst-setcontext \ - tst-setcontext2 test-a64l tst-qsort tst-system testmb2 \ + tst-setcontext2 test-a64l tst-qsort testmb2 \ bug-strtod2 tst-atof1 tst-atof2 tst-strtod2 \ tst-rand48-2 tst-makecontext tst-strtod5 \ tst-qsort2 tst-makecontext2 tst-strtod6 tst-unsetenv1 \ @@ -92,6 +92,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete tests-static := tst-secure-getenv +tests-container := tst-system ifeq ($(build-hardcoded-path-in-tests),yes) tests += tst-empty-env diff --git a/stdlib/tst-system.c b/stdlib/tst-system.c index c8c1811349..eddea33f4c 100644 --- a/stdlib/tst-system.c +++ b/stdlib/tst-system.c @@ -88,7 +88,8 @@ do_test (void) }); support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr); - char *returnerr = xasprintf ("%s: 1: %s: not found\n", + char *returnerr = xasprintf ("%s: execing %s failed: " + "No such file or directory", basename(_PATH_BSHELL), cmd); TEST_COMPARE_STRING (result.err.buffer, returnerr); free (returnerr); @@ -106,7 +107,8 @@ do_test (void) }); support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr); - char *returnerr = xasprintf ("%s: 1: %s: File name too long\n", + char *returnerr = xasprintf ("%s: execing %s failed: " + "File name too long", basename(_PATH_BSHELL), cmd); TEST_COMPARE_STRING (result.err.buffer, returnerr); free (returnerr); @@ -116,7 +118,7 @@ do_test (void) struct support_capture_subprocess result; result = support_capture_subprocess (call_system, &(struct args) { - "kill -USR1 $$", 0, SIGUSR1 + "kill $$", 0, SIGTERM }); support_capture_subprocess_check (&result, "system", 0, sc_allow_none); } @@ -136,7 +138,7 @@ do_test (void) support_capture_subprocess_check (&result, "system", 0, sc_allow_none); } - TEST_COMPARE (system (":"), 0); + TEST_COMPARE (system (""), 0); return 0; }