From nobody Mon Feb 9 05:00:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628773925; cv=none; d=zohomail.com; s=zohoarc; b=GSCtZg7xpnzzPKazj1NVu4z6k0ffd9RpkbVjlvu2YD7g3h5BiXcGk8K23WMXBnXMo2wN3Jmjur4DsuHLgQjAa6cOVjLFtP5nNrvU+p5YdnJoTrQeSBuKuoVIpQh7qk/RPUY1ug649Ckiid4ZGnm4s88SO/JMIu6W9pxdzUxDu+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628773925; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X9u8AgLx5TVn873b+QFqHcFBrvNpiteRMntG+3nq5zA=; b=HUu1mHwdi2fMsPIKSxTYvPMymuQ39Vy/Nfxjp6gfgpui5aqJ7PCJ6y+piNkpDesAGRQltcUweedPPDTuWJ/oV5cpJtUXOma1Y7EXSoPQTMbeYuOVBoNshS6tStrLBHkkQlv4gRwAYk9AGjj6P1AEkfqmDBku7YwaXc9PKJMhO0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628773925766615.3658542231377; Thu, 12 Aug 2021 06:12:05 -0700 (PDT) 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-145-vn_K_BbRO72x_Wd6osrcuA-1; Thu, 12 Aug 2021 09:12:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3AC52802CB7; Thu, 12 Aug 2021 13:11:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F6E36F97F; Thu, 12 Aug 2021 13:11:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DE2B14A700; Thu, 12 Aug 2021 13:11:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17CD1io1029730 for ; Thu, 12 Aug 2021 09:01:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2FD925DA61; Thu, 12 Aug 2021 13:01:44 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 810DA5D9C6 for ; Thu, 12 Aug 2021 13:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628773924; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=X9u8AgLx5TVn873b+QFqHcFBrvNpiteRMntG+3nq5zA=; b=A6orv11ae5lbAsD7fdfWLSt7P2vpciokh22ulpGYByRsN41zKiQ+CUY4+vhaHpUWvlC1FD Wpcl6HExkLws9cOFNGtgOgjC86RmM0UkY7HYE9vjAeit1SzICBDgdT8U8hANqvF2PyarU+ yTaaiisO8gUf1zDiXw0UCCF5QcMDeKI= X-MC-Unique: vn_K_BbRO72x_Wd6osrcuA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/6] virshtest: Don't use both '--xml' and '--shell' for 'virsh echo' Date: Thu, 12 Aug 2021 15:01:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628773926388100001 Content-Type: text/plain; charset="utf-8" Escaping for both shell and XML makes no sense. Use one at time so that we can forbid use of both. Signed-off-by: Peter Krempa --- tests/virshtest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/virshtest.c b/tests/virshtest.c index 53db2aa19a..07c27428ae 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -432,9 +432,8 @@ mymain(void) DO_TEST(15, "a A 0 + * ; . ' " / ? =3D \n < > &\= n", "echo", "--xml", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=3D", " ", "\n", "<", ">", "&"); - DO_TEST(16, "a A 0 + '*' ';' . ''' '"' / '?' =3D ' ' '\n' '&= lt;'" - " '>' '&'\n", - "echo", "--shell", "--xml", "a", "A", "0", "+", "*", ";", ".",= "'", + DO_TEST(16, "a A 0 + '*' ';' . ''\\''' '\"' / '?' =3D ' ' '\n' '<' '>'= '&'\n", + "echo", "--shell", "a", "A", "0", "+", "*", ";", ".", "\'", "\"", "/", "?", "=3D", " ", "\n", "<", ">", "&"); DO_TEST(17, "\n", "echo", ""); @@ -443,7 +442,7 @@ mymain(void) DO_TEST(19, "\n", "echo", "--xml", ""); DO_TEST(20, "''\n", - "echo", "--xml", "--shell", ""); + "echo", "--shell", ""); DO_TEST(21, "\n", "echo ''"); DO_TEST(22, "''\n", @@ -451,7 +450,7 @@ mymain(void) DO_TEST(23, "\n", "echo --xml ''"); DO_TEST(24, "''\n", - "echo --xml --shell \"\"''"); + "echo --shell \"\"''"); /* Tests of -- handling. */ DO_TEST(25, "a\n", --=20 2.31.1