From patchwork Fri Aug 11 14:50:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 800615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-83039-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="focG0frz"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xTSh12nzqz9t30 for ; Sat, 12 Aug 2017 00:54:09 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=cvdo7En7Gu7tTOZ87X4m8DGFoB4qTcu /0G4ecTT7mmeVS6hkW26h4dTcuajlXWv65hgM0d8ySHf0CrJ08E7wcHC6Gv52Ps3 qaOmJeOGv8wDEJWwPYA7xavHFG7vqNFd+rxzhnO55b2AJXtyU5bxN8+x4p9rcGtu 1ieMB3O5/fJ8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=r3Jhyi9mIK18c63aBsQza9xwAV4=; b=focG0 frz2b0GprpvoWxwygPsIz6ignwvbcIsWqvkfNOKxDI/MS5wEZDysgd6ESDGZbFX2 YGfW26pCi3qNMLviU4Qt09s2Dv70CmyhnnIIQIEQlhUx63Y+efTCUH5MX4kLo5Ph y2zHbPJbIrpc4HfQehd18IJtfEgvW9N+i42Yi8= Received: (qmail 90609 invoked by alias); 11 Aug 2017 14:51:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 80468 invoked by uid 89); 11 Aug 2017 14:51:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2978 X-HELO: mail-qt0-f177.google.com 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; bh=JVXvrzwfrGBOGG38Iy/tvIAL95guDZt9+MofFKH6iU0=; b=U8lme8Q3HHSIXyw41+eHSVLihUjRCCJxBRJqdXWkDWLWp6hVqpUDr68JDBpc/IoGbm F/xAHpP0hLt6Hcz2EnUwITDQNrhx67fsNxem0WX5E76Xgp+njA55kp4N3/MlgbnyiroI PLPMsdTe2xZXJeRkYmK3rWR1MxsawD+5ReHrXCMUIOihPLLuhR6ftjQR7VBmlZaMeBW4 ebdXpsNs9U00FgT4yVU2VRFm8QjAoBGTOx0TEgiiPFfxv3azsBSAm267izXTT33tx2fB VNziC0h+pmxrUkN/gOMxHxOH92YYNs0BaopJ1CyTtbZcPIGwVfCf7R/BqrwsmyQEl85G iUcA== X-Gm-Message-State: AHYfb5gY5/oNZRSqihI8vkRUHnQYZBxug42kfQoLjZm4B9dKIjIiDb9m IvKV9Rhs7d6WMrMpnikBWw== X-Received: by 10.200.48.232 with SMTP id w37mr20359276qta.186.1502463069562; Fri, 11 Aug 2017 07:51:09 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 14/18] posix: Use char_array for home_dir in glob Date: Fri, 11 Aug 2017 11:50:40 -0300 Message-Id: <1502463044-4042-15-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1502463044-4042-1-git-send-email-adhemerval.zanella@linaro.org> References: <1502463044-4042-1-git-send-email-adhemerval.zanella@linaro.org> This patch uses char_array for home directory discovery. It simplifies the buffer management. Checked on x86_64-linux-gnu. * posix/glob.c (glob): Use char_array for home directory. --- posix/glob.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/posix/glob.c b/posix/glob.c index 67196fd..d2cb871 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -607,8 +607,15 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), || char_array_pos (&dirname, 2) == '/'))) { /* Look up home directory. */ - char *home_dir = getenv ("HOME"); - int malloc_home_dir = 0; + 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)) + { + retval = GLOB_NOSPACE; + goto out; + } # ifdef _AMIGA if (home_dir == NULL || home_dir[0] == '\0') home_dir = "SYS:"; @@ -635,7 +642,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), home_dir = "c:/users/default"; /* poor default */ } # else - if (home_dir == NULL || home_dir[0] == '\0') + if (char_array_is_empty (&home_dir)) { int success; char user_name[LOGIN_NAME_MAX]; @@ -668,9 +675,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), # endif if (p != NULL) { - home_dir = strdup (p->pw_dir); - malloc_home_dir = 1; - if (home_dir == NULL) + if (!char_array_set_str (&home_dir, p->pw_dir)) { scratch_buffer_free (&pwtmpbuf); goto err_nospace; @@ -679,10 +684,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), scratch_buffer_free (&pwtmpbuf); } } - 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) { retval = GLOB_NOMATCH; @@ -690,8 +693,11 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), } else { - home_dir = (char *) "~"; /* No luck. */ - malloc_home_dir = 0; + if (!char_array_set_str (&home_dir, "~")) + { + retval = GLOB_NOSPACE; + goto out; + } } } # endif /* WINDOWS32 */ @@ -699,7 +705,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), /* Now construct the full directory. */ if (char_array_pos (&dirname, 1) == '\0') { - if (!char_array_set_str (&dirname, home_dir)) + if (!char_array_set_str (&dirname, char_array_str (&home_dir))) goto err_nospace; dirlen = char_array_size (&dirname) - 1; } @@ -707,9 +713,11 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), { /* Replaces '~' by the obtained HOME dir. */ char_array_erase (&dirname, 0); - if (!char_array_prepend_str (&dirname, home_dir)) + if (!char_array_prepend_str (&dirname, + char_array_str (&home_dir))) goto err_nospace; } + char_array_free (&home_dir); dirname_modified = true; } # if !defined _AMIGA && !defined WINDOWS32