From patchwork Thu Jun 8 21:13:29 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: 20868 Received: (qmail 41715 invoked by alias); 8 Jun 2017 21:14:28 -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 40831 invoked by uid 89); 8 Jun 2017 21:14:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=6898 X-HELO: mail-qt0-f182.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=mftcGRoC+RFXeTMXrZFfQPjseGZICjE9/eH/xdSJQtc=; b=WYJSsdzJw+lHlWuD5jisId+BCk2IOJZhKIw/xMjq01krBaFvkNwee37/Dzms0JCpRR FCtAczZxPHRdIkZwKMAjddRT1fC7LBbt7BR3zC5HtrJ/nbWGjnM8klgm/fuyGzi7P12j Vq9qXQlQfNQdPWeYOfksQkmVXLd/v5pn/3fUyWC5LuYndkxSalLRFxOIg0HkzftaTZ5w 9pa7DpL0/EDAgziYbrIJ1Xim7BRMBCsRunQiH5VvFNI+pi0V+J+zVA3kkhn5pCf7d9FK pt1hsEVEWVNKnAgsNU5nX7R7eB22c4LltI0cQQeEkihai225RywRkwT36ZprURpLUaqg YtkQ== X-Gm-Message-State: AODbwcAv0/b+qABMWBVZPQFT9X1LJrsLAYbIpnWzWQi4NeXFj2+laoKL beycIqhgRQVjcw6tivQ0Bw== X-Received: by 10.237.47.69 with SMTP id l63mr14253692qtd.196.1496956459181; Thu, 08 Jun 2017 14:14:19 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 15/17] posix: Use char_array for home_dir in glob Date: Thu, 8 Jun 2017 18:13:29 -0300 Message-Id: <1496956411-25594-16-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1496956411-25594-1-git-send-email-adhemerval.zanella@linaro.org> References: <1496956411-25594-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 652ae9e..4cefdca 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -606,8 +606,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:"; @@ -634,7 +641,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]; @@ -667,9 +674,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; @@ -678,10 +683,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; @@ -689,8 +692,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 */ @@ -698,7 +704,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; } @@ -706,9 +712,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