From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 D79CAC11F64 for ; Thu, 1 Jul 2021 06:21:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DE0561623 for ; Thu, 1 Jul 2021 06:21:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DE0561623 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 70744832D8; Thu, 1 Jul 2021 08:17:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T18wOZX+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 15E9B832A1; Thu, 1 Jul 2021 08:17:16 +0200 (CEST) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6C83083282 for ; Thu, 1 Jul 2021 08:16:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x733.google.com with SMTP id j13so4994844qka.8 for ; Wed, 30 Jun 2021 23:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FYz9Kixz3xINetgjAHLl2Fg8SVCTQJlYZd44o0/3iH8=; b=T18wOZX+KN2agAIipvKeMn2jPwgz8UzAefJg+0nGKJ2hrjRfUZsyRgfqk7RWlyhsRm rctYsU40Qv3o6Pdo9nzIZcdO9+Khf502l3QvldtYSwPSUhrNgD4Onzc0mdrZ9F2r8OOd wOOiusD3cBUgx7TuJxxHjPuvx3pIKKxWdRPBaqHLl52HjvcXroOfFChRBL+/PetTDPW7 03PoZtBpa1c/V0HZ4iAs4GlsNyE1ZkuHAjr4f4EWJz5aOhOlv2CA6BSKH4S4BqEbg1GL EtcOTLbk/5I9XIoM/mIgqHsxSZTt/JKf8oERs8IjiZsAUsHH+nF+RDR1RbGOAExMTUKV UQng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FYz9Kixz3xINetgjAHLl2Fg8SVCTQJlYZd44o0/3iH8=; b=VN6qXKF2JjqsGi0GS6pokmNXJynwPMJIGzHQhnfMJ73cho/v5mpLdM4qWrS46SvACO 6/yqxN0oX+woxU7Gv2mSthagQSTK9qjtazs5tauxcc6CEwHPF3L2v7Rd2KlZWrxjAdyx ds5pDch+isE6liKjdsNPdHfJhRgvcuaf6DwMvFUfOdihX4J77gT70V/Qd/jlVEPwP0Ys Q2aBYFFBSDxt4hr8h0SC14xbqFcsG1tCLbx+PpxwX4aBfCDXxhqROpj1DxnH61cwGuhZ zUWoMbrvWBXxnIrkTaqOG9IGDH80QuFszQwEBaW3GFMMGYxhb8YWOGwzLPTjkdd8NOar kbkw== X-Gm-Message-State: AOAM532IRWrmQi4R3ci1+RSXOJdgTEhoqWV6pGxWUKXgXnT7LGQCFnVK 0i984oReXPm6Fm8fdes/EbcHt/DaSfE= X-Google-Smtp-Source: ABdhPJwUsBARyeewUEZd0cl3PCk+GQ/juD+HmB9rNdtOlpl6pDohx1GthUHrqqLWk/mswHs9bGBI4g== X-Received: by 2002:a37:2f44:: with SMTP id v65mr39946664qkh.315.1625120195134; Wed, 30 Jun 2021 23:16:35 -0700 (PDT) Received: from godwin.fios-router.home (pool-74-96-87-9.washdc.fios.verizon.net. [74.96.87.9]) by smtp.gmail.com with ESMTPSA id g21sm1684673qts.90.2021.06.30.23.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:16:34 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Wolfgang Denk , Simon Glass , Roland Gaudig , Heinrich Schuchardt , Kostas Michalopoulos , Sean Anderson Subject: [RFC PATCH 27/28] cli: lil: Add a function to quote values Date: Thu, 1 Jul 2021 02:16:10 -0400 Message-Id: <20210701061611.957918-28-seanga2@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210701061611.957918-1-seanga2@gmail.com> References: <20210701061611.957918-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This allows us to convert lil_values into a form which can be re-parsed. We were already doing this for lists, so we just have to expose the inner loop. Signed-off-by: Sean Anderson --- common/cli_lil.c | 89 ++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/common/cli_lil.c b/common/cli_lil.c index 42659920b5..2a8600ffb6 100644 --- a/common/cli_lil.c +++ b/common/cli_lil.c @@ -2387,49 +2387,64 @@ braces: return needs; } +static enum lil_error do_quote(struct lil_value *val, struct lil_value *item) +{ + char q; + size_t i; + + switch (item_needs(lil_to_string(item), item->l)) { + case NEEDS_NOTHING: + return lil_append_val(val, item); + case NEEDS_BRACES: + return lil_append_char(val, '{') ?: + lil_append_val(val, item) ?: + lil_append_char(val, '}'); + case NEEDS_DOUBLE: + q = '"'; + goto quote; + case NEEDS_SINGLE: + q = '\''; +quote: + if (lil_append_char(val, q)) + return LIL_ERR_OOM; + + for (i = 0; i < item->l; i++) { + char c = item->d[i]; + + if (c == '\\' || c == q) + if (lil_append_char(val, '\\')) + return LIL_ERR_OOM; + if (lil_append_char(val, c)) + return LIL_ERR_OOM; + } + if (lil_append_char(val, q)) + return LIL_ERR_OOM; + } + return LIL_ERR_NONE; +} + +static struct lil_value *lil_quote_value(struct lil_value *val) +{ + struct lil_value *r = alloc_value(NULL); + + if (do_quote(r, val)) { + lil_free_value(r); + return NULL; + } + return r; +} + struct lil_value *lil_list_to_value(struct lil_list *list) { struct lil_value *val = alloc_value(NULL); - size_t i, j; + size_t i; for (i = 0; i < list->c; i++) { - char q; - struct lil_value *item = lil_list_get(list, i); + if (i && lil_append_char(val, ' ')) + goto err; - if (i) - lil_append_char(val, ' '); - - switch (item_needs(lil_to_string(item), item->l)) { - case NEEDS_NOTHING: - if (lil_append_val(val, item)) - goto err; - continue; - case NEEDS_BRACES: - if (lil_append_char(val, '{') || - lil_append_val(val, item) || - lil_append_char(val, '}')) - goto err; - continue; - case NEEDS_DOUBLE: - q = '"'; - goto quote; - case NEEDS_SINGLE: - q = '\''; -quote: - if (lil_append_char(val, q)) - goto err; - for (j = 0; j < item->l; j++) { - char c = item->d[j]; - - if (c == '\\' || c == q) - if (lil_append_char(val, '\\')) - goto err; - if (lil_append_char(val, c)) - goto err; - } - if (lil_append_char(val, q)) - goto err; - } + if (do_quote(val, lil_list_get(list, i))) + goto err; } return val; -- 2.32.0