Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6BD0C2BA19 for ; Wed, 15 Apr 2020 07:49:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2BFE20575 for ; Wed, 15 Apr 2020 07:49:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BiuF5g0G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2BFE20575 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOcnP-0005EJ-Rn for qemu-devel@archiver.kernel.org; Wed, 15 Apr 2020 03:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50754) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOcmQ-0003P1-QF for qemu-devel@nongnu.org; Wed, 15 Apr 2020 03:48:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOcmP-0006x9-S7 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 03:48:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:47917 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOcmP-0006wo-OO for qemu-devel@nongnu.org; Wed, 15 Apr 2020 03:48:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586936897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mD6wBCw/UACojzRY5F87AOnrP8+VL7OjKe8PQZpcAy0=; b=BiuF5g0Gb6KIMbb+zJs6k1CfOMH2bJFMy2nP76dp9I9Jg6LsaICUfBvGXG4FycJ80WC9XF UEID7ktEVM4hVYloztRHSsfDVNP4SN0r4NDaA+A4r32lQXpftzClreR0wAhvMBVMidiBJZ VyFMi6GFeLC8ENj4yzytVa0OXmXGU6I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-RTnze2n5OiaRudgD3b1M3w-1; Wed, 15 Apr 2020 03:48:15 -0400 X-MC-Unique: RTnze2n5OiaRudgD3b1M3w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D17E182B908; Wed, 15 Apr 2020 07:48:14 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67E215C1B2; Wed, 15 Apr 2020 07:48:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D931011385C8; Wed, 15 Apr 2020 09:48:12 +0200 (CEST) From: Markus Armbruster To: Kevin Wolf Subject: Re: [PATCH for-5.1 5/8] qemu-option: Fix has_help_option()'s sloppy parsing References: <20200409153041.17576-1-armbru@redhat.com> <20200409153041.17576-6-armbru@redhat.com> <4e7c8e64-b5fe-4b8c-70d4-f6b2ea527e6a@redhat.com> <87o8ruv0c8.fsf@dusky.pond.sub.org> <20200414145735.GJ7747@linux.fritz.box> Date: Wed, 15 Apr 2020 09:48:12 +0200 In-Reply-To: <20200414145735.GJ7747@linux.fritz.box> (Kevin Wolf's message of "Tue, 14 Apr 2020 16:57:35 +0200") Message-ID: <87v9m1jikj.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Kevin Wolf writes: > Am 14.04.2020 um 12:16 hat Markus Armbruster geschrieben: >> Eric Blake writes: >>=20 >> > On 4/9/20 10:30 AM, Markus Armbruster wrote: >> >> has_help_option() uses its own parser. It's inconsistent with >> >> qemu_opts_parse(), as demonstrated by test-qemu-opts case >> >> /qemu-opts/has_help_option. Fix by reusing the common parser. >> >> >> >> Signed-off-by: Markus Armbruster > >> >> @@ -165,26 +165,6 @@ void parse_option_size(const char *name, const c= har *value, >> >> *ret =3D size; >> >> } >> >> -bool has_help_option(const char *param) >> >> -{ >> >> - const char *p =3D param; >> >> - bool result =3D false; >> >> - >> >> - while (*p && !result) { >> >> - char *value; >> >> - >> >> - p =3D get_opt_value(p, &value); >> >> - if (*p) { >> >> - p++; >> >> - } >> >> - >> >> - result =3D is_help_option(value); >> > >> > Old code: both 'help' and '?' are accepted. >> > >> >> +bool has_help_option(const char *params) >> >> +{ >> >> + const char *p; >> >> + char *name, *value; >> >> + bool ret; >> >> + >> >> + for (p =3D params; *p;) { >> >> + p =3D get_opt_name_value(p, NULL, &name, &value); >> >> + ret =3D !strcmp(name, "help"); >> > >> > New code: only 'help' is accepted. Is the loss of '?' intentional? >>=20 >> No. Will fix, thanks! > > Please also add some '?' test cases while you're at it. Okay.