From patchwork Tue Aug 8 14:17:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yeqi Fu X-Patchwork-Id: 1818630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=o2EaCPJJ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RKwM30mKBz1yYC for ; Wed, 9 Aug 2023 00:20:15 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTNYV-0001FJ-OF; Tue, 08 Aug 2023 10:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTNYP-0001Dh-GH for qemu-devel@nongnu.org; Tue, 08 Aug 2023 10:19:21 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTNYL-0000FA-3p for qemu-devel@nongnu.org; Tue, 08 Aug 2023 10:19:20 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1bbd03cb7c1so37064265ad.3 for ; Tue, 08 Aug 2023 07:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691504353; x=1692109153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M3BM9BzxXOpCLcC2shnZCuIGaJIXuF6fdRmpn3JtABg=; b=o2EaCPJJVxBdZLR/6hEwbNOA27YnxbnNvnZnWa8Xk8Hv0sIivneFt8a87tpSxOIDbm pN37ynMn5g8zu4pluX7Ll2MoNjgLsJKlOE9HjKP6M0lwmr902sS/OyKuzjKcstjOBr3r FB6nLa9W9oGXzFzJSM8CONOMrmr5x0EG2wNgbhVotXxy3sQ06XCNtG2YaiwAtP43/RVC G/fH/mgpzkf5AFPLa035f89z0KPHRF+dpIhjg/4ZtPSpNRWo+YXpFV7sXFV5VDNtfRz2 af0C2Oa3GW4po2s8jB2jPePBQp5dvNJmytEGizRrb3BXj1o9c3EHdYf/mmNz24vTjfzA J94w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691504353; x=1692109153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M3BM9BzxXOpCLcC2shnZCuIGaJIXuF6fdRmpn3JtABg=; b=HKOth0t7cSUvSWU3bwnkJHJR/YhSC8erCOfqUbVnku+Lei/ASgdif/P/PpzdJtKDOv 2DpMTa4XrcB6S1o9VjDpRpOSAR6c2+nvisYmKtMrjo8Bn9TY07KnXGxHt+oSDKQh3KA7 x9FutEk3DpoKPCouSFfa5uVNu+TBaHLajEOnBpFOoYObuTZBvdP74ayjBEk2mK0ztj+8 yBZcaHeVMlEUwWbu4PD7bqjpwKCUMJzYs+jIE1mX0yNMwgnYb6HjqAGvvl4tNbh7bT9n 8NHqTA8TT+9kQrpLGyRMbPl05StAnP9CrMRUR/JYjSy2G/ISZimZ7sovvXAnhND+vAl0 8Qqw== X-Gm-Message-State: AOJu0YzySS71t4ZpvWws4y1AEspEvCv3M5JMPfhmfmyUxuMMoaphKrsM dW/+YLidr/O/W3tNzicHzVBtOivQcBJviqN+ X-Google-Smtp-Source: AGHT+IHuDmAMB+YhTJWAI1nKGwJneUcrZzBHw51y0rsretTsqk0Epi8AmPVObZ8ReD5LpG5HZJ03KA== X-Received: by 2002:a17:902:c94e:b0:1b6:7f96:42ca with SMTP id i14-20020a170902c94e00b001b67f9642camr10574403pla.66.1691504352740; Tue, 08 Aug 2023 07:19:12 -0700 (PDT) Received: from localhost.localdomain ([223.104.41.22]) by smtp.gmail.com with ESMTPSA id c3-20020a170902b68300b001bb1f0605b2sm9043985pls.214.2023.08.08.07.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 07:19:12 -0700 (PDT) From: Yeqi Fu To: alex.bennee@linaro.org Cc: richard.henderson@linaro.org, qemu-devel@nongnu.org, Yeqi Fu Subject: [RFC v4 03/11] linux-user: Implement envlist_appendenv and add tests for envlist Date: Tue, 8 Aug 2023 22:17:31 +0800 Message-Id: <20230808141739.3110740-4-fufuyqqqqqq@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230808141739.3110740-1-fufuyqqqqqq@gmail.com> References: <20230808141739.3110740-1-fufuyqqqqqq@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=fufuyqqqqqq@gmail.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 Signed-off-by: Yeqi Fu Reviewed-by: Alex Bennée --- include/qemu/envlist.h | 13 ++++++ tests/unit/meson.build | 1 + tests/unit/test-envlist.c | 94 +++++++++++++++++++++++++++++++++++++++ util/envlist.c | 71 ++++++++++++++++++++++++----- 4 files changed, 169 insertions(+), 10 deletions(-) create mode 100644 tests/unit/test-envlist.c diff --git a/include/qemu/envlist.h b/include/qemu/envlist.h index 6006dfae44..9eb1459e79 100644 --- a/include/qemu/envlist.h +++ b/include/qemu/envlist.h @@ -1,12 +1,25 @@ #ifndef ENVLIST_H #define ENVLIST_H +#include "qemu/queue.h" + +struct envlist_entry { + const char *ev_var; /* actual env value */ + QLIST_ENTRY(envlist_entry) ev_link; +}; + +struct envlist { + QLIST_HEAD(, envlist_entry) el_entries; /* actual entries */ + size_t el_count; /* number of entries */ +}; + typedef struct envlist envlist_t; envlist_t *envlist_create(void); void envlist_free(envlist_t *); int envlist_setenv(envlist_t *, const char *); int envlist_unsetenv(envlist_t *, const char *); +int envlist_appendenv(envlist_t *, const char *, const char *); int envlist_parse_set(envlist_t *, const char *); int envlist_parse_unset(envlist_t *, const char *); char **envlist_to_environ(const envlist_t *, size_t *); diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 93977cc32d..9b25b45271 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -50,6 +50,7 @@ tests = { 'test-qapi-util': [], 'test-interval-tree': [], 'test-xs-node': [qom], + 'test-envlist': [], } if have_system or have_tools diff --git a/tests/unit/test-envlist.c b/tests/unit/test-envlist.c new file mode 100644 index 0000000000..d1e148f738 --- /dev/null +++ b/tests/unit/test-envlist.c @@ -0,0 +1,94 @@ +/* + * testenvlist unit-tests. + */ + +#include "qemu/osdep.h" +#include "qemu/envlist.h" + +static void envlist_create_free_test(void) +{ + envlist_t *testenvlist; + + testenvlist = envlist_create(); + g_assert(testenvlist != NULL); + g_assert(testenvlist->el_count == 0); + + envlist_free(testenvlist); +} + +static void envlist_set_unset_test(void) +{ + envlist_t *testenvlist; + const char *env = "TEST=123"; + struct envlist_entry *entry; + + testenvlist = envlist_create(); + g_assert(envlist_setenv(testenvlist, env) == 0); + g_assert(testenvlist->el_count == 1); + entry = testenvlist->el_entries.lh_first; + g_assert_cmpstr(entry->ev_var, ==, "TEST=123"); + g_assert(envlist_unsetenv(testenvlist, "TEST") == 0); + g_assert(testenvlist->el_count == 0); + + envlist_free(testenvlist); +} + +static void envlist_parse_set_unset_test(void) +{ + envlist_t *testenvlist; + const char *env = "TEST1=123,TEST2=456"; + + testenvlist = envlist_create(); + g_assert(envlist_parse_set(testenvlist, env) == 0); + g_assert(testenvlist->el_count == 2); + g_assert(envlist_parse_unset(testenvlist, "TEST1,TEST2") == 0); + g_assert(testenvlist->el_count == 0); + + envlist_free(testenvlist); +} + +static void envlist_appendenv_test(void) +{ + envlist_t *testenvlist; + const char *env = "TEST=123"; + struct envlist_entry *entry; + + testenvlist = envlist_create(); + g_assert(envlist_setenv(testenvlist, env) == 0); + g_assert(envlist_appendenv(testenvlist, "TEST=456", ";") == 0); + entry = testenvlist->el_entries.lh_first; + g_assert_cmpstr(entry->ev_var, ==, "TEST=123;456"); + + envlist_free(testenvlist); +} + +static void envlist_to_environ_test(void) +{ + envlist_t *testenvlist; + const char *env = "TEST1=123,TEST2=456"; + size_t count; + char **environ; + + testenvlist = envlist_create(); + g_assert(envlist_parse_set(testenvlist, env) == 0); + g_assert(testenvlist->el_count == 2); + environ = envlist_to_environ(testenvlist, &count); + g_assert(count == 2); + g_assert_cmpstr(environ[1], ==, "TEST1=123"); + g_assert_cmpstr(environ[0], ==, "TEST2=456"); + + envlist_free(testenvlist); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/envlist/create_free", envlist_create_free_test); + g_test_add_func("/envlist/set_unset", envlist_set_unset_test); + g_test_add_func("/envlist/parse_set_unset", envlist_parse_set_unset_test); + g_test_add_func("/envlist/appendenv", envlist_appendenv_test); + g_test_add_func("/envlist/to_environ", envlist_to_environ_test); + + return g_test_run(); +} diff --git a/util/envlist.c b/util/envlist.c index db937c0427..2570f0e30c 100644 --- a/util/envlist.c +++ b/util/envlist.c @@ -2,16 +2,6 @@ #include "qemu/queue.h" #include "qemu/envlist.h" -struct envlist_entry { - const char *ev_var; /* actual env value */ - QLIST_ENTRY(envlist_entry) ev_link; -}; - -struct envlist { - QLIST_HEAD(, envlist_entry) el_entries; /* actual entries */ - size_t el_count; /* number of entries */ -}; - static int envlist_parse(envlist_t *envlist, const char *env, int (*)(envlist_t *, const char *)); @@ -201,6 +191,67 @@ envlist_unsetenv(envlist_t *envlist, const char *env) return (0); } +/* + * Appends environment value to envlist. If the environment + * variable already exists, the new value is appended to the + * existing one. + * + * Returns 0 in success, errno otherwise. + */ +int +envlist_appendenv(envlist_t *envlist, const char *env, const char *separator) +{ + struct envlist_entry *entry = NULL; + const char *eq_sign; + size_t envname_len; + + if ((envlist == NULL) || (env == NULL) || (separator == NULL)) { + return -EINVAL; + } + + /* find out first equals sign in given env */ + eq_sign = strchr(env, '='); + if (eq_sign == NULL) { + return -EINVAL; + } + + if (strchr(eq_sign + 1, '=') != NULL) { + return -EINVAL; + } + + envname_len = eq_sign - env + 1; + + /* + * If there already exists variable with given name, + * we append the new value to the existing one. + */ + for (entry = envlist->el_entries.lh_first; entry != NULL; + entry = entry->ev_link.le_next) { + if (strncmp(entry->ev_var, env, envname_len) == 0) { + break; + } + } + + if (entry != NULL) { + char *new_env_value = NULL; + size_t new_env_len = strlen(entry->ev_var) + strlen(eq_sign) + + strlen(separator) + 1; + new_env_value = g_malloc(new_env_len); + strcpy(new_env_value, entry->ev_var); + strcat(new_env_value, separator); + strcat(new_env_value, eq_sign + 1); + g_free((char *)entry->ev_var); + entry->ev_var = new_env_value; + } else { + envlist->el_count++; + entry = g_malloc(sizeof(*entry)); + entry->ev_var = g_strdup(env); + QLIST_INSERT_HEAD(&envlist->el_entries, entry, ev_link); + } + + return 0; +} + /* * Returns given envlist as array of strings (in same form that * global variable environ is). Caller must free returned memory