From patchwork Tue Jan 5 18:58:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 41648 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4CFF9393C852; Tue, 5 Jan 2021 18:58:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CFF9393C852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609873122; bh=H+N/s2PkRpLKCj26zNT/jQIAlrfNWHt8dlvp0LQion0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=S2kWWfFzaEI+f4xw9npKCmJx6dUkR9JgPWKD5AMuWc/MR1Owd+fsExJxfZzNnlQvQ Rnh9FWsYIH8azW++LgvUs92hyMhVLubcWor6iXpY21WYFDGM2zAWsSHwKQVtwPNm75 c+drr0ImYfp8fDeRMDgcP4whv5ffx/jgrkZCgoXE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 3389A393C84D for ; Tue, 5 Jan 2021 18:58:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3389A393C84D Received: by mail-qk1-x735.google.com with SMTP id n142so334965qkn.2 for ; Tue, 05 Jan 2021 10:58:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H+N/s2PkRpLKCj26zNT/jQIAlrfNWHt8dlvp0LQion0=; b=tQHRXxV5NY2QX82C/FL8YAf4qKx0VZkAeXqL/6zD4mTwYubEu6Wkoj3jG4Snbr/bOi +guZ2Zyy1LYvsEWGOoYlJ5/U7dBlVcscQFE28kvO+gnBBteiIavCcbnQ7ssf5DtakRfQ ZmSlRmbnaYlFPgv7Emw/zo6b7UnICxxRF+flWE5LLBZMRYuDQlTNl42wKos1gJoPbE6R TOLjVXFL4sC3UqYI5WxxbEmI1GUPPL0fzzYoMGHh5R1CMtOpXXYiXQGuo2xElWS1M5aQ Jf0igO2hXmXJVmc+bH/jiD50NFxRPVySAnojOb/psR9ahAyOD0Yh/NLldCOjuiMl8Gvl ehDA== X-Gm-Message-State: AOAM532nefrb9mENQ5krhfL2KoibnBfuzFLntPgWfMdXX9VWw0x6MYWj IV2gUf6EiXr37c1a7OI/0co/ru0exnHXtA== X-Google-Smtp-Source: ABdhPJxU+M0y1e3MPU28aUEbqP6V3jGJNV3KxD80kasWodOZDZ7aQwWJBpLeXzFI0HR0xemJsrF8Bw== X-Received: by 2002:a37:6c1:: with SMTP id 184mr862308qkg.381.1609873118586; Tue, 05 Jan 2021 10:58:38 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id t68sm67792qkd.35.2021.01.05.10.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 10:58:38 -0800 (PST) To: libc-alpha@sourceware.org, Paul Eggert , bug-gnulib@gnu.org Subject: [PATCH 7/8] posix: Use char_array for home_dir in glob Date: Tue, 5 Jan 2021 15:58:19 -0300 Message-Id: <20210105185820.3796657-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105185820.3796657-1-adhemerval.zanella@linaro.org> References: <20210105185820.3796657-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This patch uses dynarray at glob internal home directory ame manipulation for GLOB_TILDE. It simplifies it and removes all the boilerplate buffer managements required. Checked x86_64-linux-gnu. --- posix/glob.c | 69 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/posix/glob.c b/posix/glob.c index c126b4501d..b6727ee884 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -606,10 +606,15 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), && (char_array_pos (&dirname, 2) == '\0' || char_array_pos (&dirname, 2) == '/'))) { + struct char_array home_dir; + + const char *home_env = getenv ("HOME"); + home_env = home_env == NULL ? "" : home_env; + if (!char_array_init_str (&home_dir, home_env)) + goto err_nospace; + + if (char_array_is_empty (&home_dir)) /* Look up home directory. */ - char *home_dir = getenv ("HOME"); - int malloc_home_dir = 0; - if (home_dir == NULL || home_dir[0] == '\0') { #ifdef WINDOWS32 /* Windows NT defines HOMEDRIVE and HOMEPATH. But give @@ -619,16 +624,21 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), if (home_drive != NULL && home_path != NULL) { - size_t home_drive_len = strlen (home_drive); - size_t home_path_len = strlen (home_path); - char *mem = alloca (home_drive_len + home_path_len + 1); - - memcpy (mem, home_drive, home_drive_len); - memcpy (mem + home_drive_len, home_path, home_path_len + 1); - home_dir = mem; + if (!char_array_set_str (&home_dir, home_drive) + || !char_array_append_str (&home_dir, home_path)) + { + char_array_free (&home_dir); + goto err_nospace; + } } else - home_dir = "c:/users/default"; /* poor default */ + { + if (!char_array_set_str (&home_dir, "c:/users/default")) + { + char_array_free (&home_dir); + goto err_nospace; + } + } #else int err; struct passwd *p; @@ -657,44 +667,49 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), if (!scratch_buffer_grow (&s)) goto err_nospace; } - if (err == 0) - { - home_dir = strdup (p->pw_dir); - malloc_home_dir = 1; - } + if (err == 0 && !char_array_set_str (&home_dir, p->pw_dir)) + err = 1; scratch_buffer_free (&s); - if (err == 0 && home_dir == NULL) - goto err_nospace; + if (err == 0) + goto err_nospace; #endif /* WINDOWS32 */ } - if (home_dir == NULL || home_dir[0] == '\0') + if (char_array_is_empty (&home_dir)) { - if (__glibc_unlikely (malloc_home_dir)) - free (home_dir); if (flags & GLOB_TILDE_CHECK) { + char_array_free (&home_dir); retval = GLOB_NOMATCH; goto out; } else { - home_dir = (char *) "~"; /* No luck. */ - malloc_home_dir = 0; + if (!char_array_set_str (&home_dir, "~")) + { + char_array_free (&home_dir); + goto err_nospace; + } } } /* Now construct the full directory. */ + bool e = true; if (char_array_pos (&dirname, 1) == '\0') { - if (!char_array_set_str (&dirname, home_dir)) - goto err_nospace; + e = char_array_set_str (&dirname, char_array_str (&home_dir)); dirlen = char_array_size (&dirname) - 1; } else { /* Replaces '~' by the obtained HOME dir. */ char_array_erase (&dirname, 0); - if (!char_array_prepend_str (&dirname, home_dir)) - goto err_nospace; + e = char_array_prepend_str (&dirname, + char_array_str (&home_dir)); + } + if (e == false) + { + char_array_free (&dirname); + char_array_free (&home_dir); + goto err_nospace; } dirname_modified = true; }