From patchwork Thu Apr 25 16:37:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 239652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9F3282C00E8 for ; Fri, 26 Apr 2013 14:34:47 +1000 (EST) Received: from localhost ([::1]:34496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVaMv-0004XT-RU for incoming@patchwork.ozlabs.org; Fri, 26 Apr 2013 00:34:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVPBa-0003pO-75 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 12:38:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVPBQ-00081r-F2 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 12:38:18 -0400 Received: from smtprelay02.ispgateway.de ([80.67.31.40]:44676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVPBQ-00081S-5K for qemu-devel@nongnu.org; Thu, 25 Apr 2013 12:38:08 -0400 Received: from [217.84.9.72] (helo=stokes.schwinge.homeip.net) by smtprelay02.ispgateway.de with esmtpa (Exim 4.68) (envelope-from ) id 1UVPBO-0005NX-1J for qemu-devel@nongnu.org; Thu, 25 Apr 2013 18:38:06 +0200 Received: (qmail 5866 invoked from network); 25 Apr 2013 16:37:51 -0000 Received: from feldtkeller.schwinge.homeip.net (192.168.111.172) by stokes.schwinge.homeip.net with QMQP; 25 Apr 2013 16:37:51 -0000 Received: (nullmailer pid 22046 invoked by uid 1000); Thu, 25 Apr 2013 16:37:51 -0000 From: Thomas Schwinge To: riku.voipio@iki.fi Date: Thu, 25 Apr 2013 18:37:41 +0200 Message-Id: <1366907861-22011-1-git-send-email-thomas@codesourcery.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366902405-19117-4-git-send-email-thomas@codesourcery.com> References: <1366902405-19117-4-git-send-email-thomas@codesourcery.com> X-Df-Sender: dGhvbWFzQHNjaHdpbmdlLm5hbWU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.67.31.40 X-Mailman-Approved-At: Fri, 26 Apr 2013 00:34:19 -0400 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, sw@weilnetz.de, agraf@suse.de, qemu-devel@nongnu.org, paul@codesourcery.com, j.schauer@email.de, Thomas Schwinge Subject: [Qemu-devel] [PATCH v2] linux-user: Restore original behavior of the -E and -U command-line options. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Revert the change in behavior that had been introducecd in commit fc9c54124d134dbd76338a92a91804dab2df8166 for the -E and -U command-line options, but keep the comma-splitting for the QEMU_SET_ENV and QEMU_UNSET_ENV environment variables. Signed-off-by: Thomas Schwinge --- linux-user/main.c | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git linux-user/main.c linux-user/main.c index 50bbadf..c539125 100644 --- linux-user/main.c +++ linux-user/main.c @@ -3209,15 +3209,37 @@ static void handle_arg_log_filename(arg_origin whence, const char *arg) static void handle_arg_set_env(arg_origin whence, const char *arg) { - if (envlist_parse_set(envlist, arg) != 0) { - usage(); + switch (whence) { + case ARG_ORIGIN_ENV: + if (envlist_parse_set(envlist, arg) != 0) { + usage(); + } + break; + case ARG_ORIGIN_CMDLINE: + if (envlist_setenv(envlist, arg) != 0) { + usage(); + } + break; + default: + abort(); } } static void handle_arg_unset_env(arg_origin whence, const char *arg) { - if (envlist_parse_unset(envlist, arg) != 0) { - usage(); + switch (whence) { + case ARG_ORIGIN_ENV: + if (envlist_parse_unset(envlist, arg) != 0) { + usage(); + } + break; + case ARG_ORIGIN_CMDLINE: + if (envlist_unsetenv(envlist, arg) != 0) { + usage(); + } + break; + default: + abort(); } } @@ -3443,18 +3465,15 @@ static void usage(void) guest_stack_size); printf("\n" - "You can use -E and -U options or the QEMU_SET_ENV and\n" - "QEMU_UNSET_ENV environment variables to set and unset\n" - "environment variables for the target process.\n" - "It is possible to provide several variables by separating them\n" - "by commas in getsubopt(3) style. Additionally it is possible to\n" - "provide the -E and -U options multiple times.\n" - "The following lines are equivalent:\n" - " -E var1=val2 -E var2=val2 -U LD_PRELOAD -U LD_DEBUG\n" - " -E var1=val2,var2=val2 -U LD_PRELOAD,LD_DEBUG\n" - " QEMU_SET_ENV=var1=val2,var2=val2 QEMU_UNSET_ENV=LD_PRELOAD,LD_DEBUG\n" - "Note that if you provide several changes to a single variable\n" - "the last change will stay in effect.\n"); +"The -E and -U command-line options can be provided multiple times to set\n" +"and unset environment variables for the target process, and -E can be used\n" +"to specify values containing commas. When using the QEMU_SET_ENV and\n" +"QEMU_UNSET_ENV environment variables, a comma is used in getsubopt(3) style\n" +"to set or unset several variables. The following lines are equivalent:\n" +" -E var1=val2 -E var2=val2 -U LD_PRELOAD -U LD_DEBUG\n" +" QEMU_SET_ENV=var1=val2,var2=val2 QEMU_UNSET_ENV=LD_PRELOAD,LD_DEBUG\n" +"Note that if you provide several changes to a single variable, the last\n" +"change will stay in effect.\n"); exit(1); }