From nobody Mon Mar 23 21:24:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1773330715; cv=none; d=zohomail.com; s=zohoarc; b=RjzKaGyrUqGCyQci75pxoBVB6p5kcK0jp4H4+CJtQeS0vzuOWOJZ+0Jp+TEIID9xf5WX31hz1VeAHRKrOkGZZS7AOSWe4K9ZBDf5j5W0yXs4Qu0kL58Dwb5AZc7vfqqVUJ/y9CCCj7BLNDyg0gPE6lF30C2+t9BUadLoCNo4FzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773330715; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=536CC7FPa9EY0f440nvgYhoisCibNAKp2N047ggM1Lo=; b=OBS6N6arQ6oAfzEHypO4+rmZdpzgWYmymuYWGnXUHUoZ6cU9mO+a9kdNQwcfORji410n8zAasLNhrIsVc+NH6AvoYAUMtpGHBtRsj+th49fwpuaiTtrtz4jOTeQgS4+LFDY1NsiA54Z5dhvHecwd716JLlOeGSJYaHCiB829EeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773330715868115.91097435481356; Thu, 12 Mar 2026 08:51:55 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1252560.1549207 (Exim 4.92) (envelope-from ) id 1w0iK4-0008W0-TY; Thu, 12 Mar 2026 15:51:40 +0000 Received: by outflank-mailman (output) from mailman id 1252560.1549207; Thu, 12 Mar 2026 15:51:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0iK4-0008Vr-QV; Thu, 12 Mar 2026 15:51:40 +0000 Received: by outflank-mailman (input) for mailman id 1252560; Thu, 12 Mar 2026 15:51:40 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0iK4-0007Yh-1t for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 15:51:40 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2a07:de40:b251:101:10:150:64:1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b4c35ec-1e2b-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 16:51:39 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C2ED94D422; Thu, 12 Mar 2026 15:51:38 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 989B34004A; Thu, 12 Mar 2026 15:51:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 1XqzIwrhsmmETQAAD6G6ig (envelope-from ); Thu, 12 Mar 2026 15:51:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b4c35ec-1e2b-11f1-b164-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773330698; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=536CC7FPa9EY0f440nvgYhoisCibNAKp2N047ggM1Lo=; b=h16lj+687PEh5/wSkXFmhFppRKRDh0gvc8nB2GhYxXlF6m9EQIbUI7NTA+QMfHC+Eu5NCW 8ye203t+bNtyQjAJ4T9ZXf/GXJ6+NRF2spv9cZcqwBcTzTirxbfpp6iqlSuRpVOeE6wcWf kt6nn+5m0S+ZOSg7/xHGTK2cKVYG298= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773330698; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=536CC7FPa9EY0f440nvgYhoisCibNAKp2N047ggM1Lo=; b=h16lj+687PEh5/wSkXFmhFppRKRDh0gvc8nB2GhYxXlF6m9EQIbUI7NTA+QMfHC+Eu5NCW 8ye203t+bNtyQjAJ4T9ZXf/GXJ6+NRF2spv9cZcqwBcTzTirxbfpp6iqlSuRpVOeE6wcWf kt6nn+5m0S+ZOSg7/xHGTK2cKVYG298= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Julien Grall , Anthony PERARD Subject: [PATCH v2 6/8] tools/xs-clients: don't exit with error when using -h parameter Date: Thu, 12 Mar 2026 16:51:00 +0100 Message-ID: <20260312155102.2862824-7-jgross@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312155102.2862824-1-jgross@suse.com> References: <20260312155102.2862824-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.996]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1773330717034158500 Content-Type: text/plain; charset="utf-8" The "-h" parameter of the xenstore-* programs is explicitly meant to show the usage information of the programs. This use case should not result in an error of the program's exit code. Signed-off-by: Juergen Gross --- V2: - new patch --- tools/xs-clients/xenstore_client.c | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/xs-clients/xenstore_client.c b/tools/xs-clients/xenstore= _client.c index a104cf6487..1794451d43 100644 --- a/tools/xs-clients/xenstore_client.c +++ b/tools/xs-clients/xenstore_client.c @@ -214,37 +214,37 @@ output_raw(const char *data, int len) } =20 static void -usage(enum mode mode, int incl_mode, const char *progname) +usage(int eval, enum mode mode, int incl_mode, const char *progname) { const char *mstr =3D NULL; =20 switch (mode) { case MODE_unknown: - errx(1, "Usage: %s [-h] [...]", progname); + errx(eval, "Usage: %s [-h] [...]", progname); case MODE_read: mstr =3D incl_mode ? "read " : ""; - errx(1, "Usage: %s %s[-h] [-p] [-R] key [...]", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-p] [-R] key [...]", progname, mstr); case MODE_write: mstr =3D incl_mode ? "write " : ""; - errx(1, "Usage: %s %s[-h] [-R] key value [...]", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-R] key value [...]", progname, mstr); case MODE_rm: mstr =3D incl_mode ? "rm " : ""; - errx(1, "Usage: %s %s[-h] [-t] key [...]", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-t] key [...]", progname, mstr); case MODE_exists: mstr =3D incl_mode ? "exists " : ""; /* fallthrough */ case MODE_list: mstr =3D mstr ? : incl_mode ? "list " : ""; - errx(1, "Usage: %s %s[-h] [-p] key [...]", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-p] key [...]", progname, mstr); case MODE_ls: mstr =3D mstr ? : incl_mode ? "ls " : ""; - errx(1, "Usage: %s %s[-h] [-f] [-p] [path]", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-f] [-p] [path]", progname, mstr); case MODE_chmod: mstr =3D incl_mode ? "chmod " : ""; - errx(1, "Usage: %s %s[-h] [-u] [-r] key ", progname, mst= r); + errx(eval, "Usage: %s %s[-h] [-u] [-r] key ", progname, = mstr); case MODE_watch: mstr =3D incl_mode ? "watch " : ""; - errx(1, "Usage: %s %s[-h] [-n NR] key", progname, mstr); + errx(eval, "Usage: %s %s[-h] [-n NR] key", progname, mstr); } } =20 @@ -685,7 +685,7 @@ main(int argc, char **argv) command =3D command + strlen("xenstore-"); } else if (argc < 2) - usage(MODE_unknown, 0, argv[0]); + usage(1, MODE_unknown, 0, argv[0]); else { command =3D argv[1]; @@ -715,7 +715,7 @@ main(int argc, char **argv) =20 switch (c) { case 'h': - usage(mode, switch_argv, argv[0]); + usage(0, mode, switch_argv, argv[0]); /* NOTREACHED */ case 'f': if ( mode =3D=3D MODE_ls ) { @@ -723,44 +723,44 @@ main(int argc, char **argv) desired_width =3D 0; show_whole_path =3D 1; } else { - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); } break; case 'p': if ( mode =3D=3D MODE_read || mode =3D=3D MODE_list || mode =3D=3D MO= DE_ls ) prefix =3D 1; else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; case 't': if ( mode =3D=3D MODE_rm ) tidy =3D 1; else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; case 'u': if ( mode =3D=3D MODE_chmod ) upto =3D 1; else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; case 'r': if ( mode =3D=3D MODE_chmod ) recurse =3D 1; else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; case 'n': if ( mode =3D=3D MODE_watch ) nr_watches =3D atoi(optarg); else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; case 'R': if ( mode =3D=3D MODE_read || mode =3D=3D MODE_write ) raw =3D 1; else - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); break; } } @@ -770,13 +770,13 @@ main(int argc, char **argv) break; case MODE_write: if ((argc - switch_argv - optind) % 2 =3D=3D 1) { - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); /* NOTREACHED */ } /* DROP-THRU */ default: if (optind =3D=3D argc - switch_argv) { - usage(mode, switch_argv, argv[0]); + usage(1, mode, switch_argv, argv[0]); /* NOTREACHED */ } } --=20 2.53.0