Patchwork [7/8] posix: Use char_array for home_dir in glob

login
register
mail settings
Submitter Adhemerval Zanella Netto
Date Nov. 21, 2017, 1:55 p.m.
Message ID <1511272530-10936-8-git-send-email-adhemerval.zanella@linaro.org>
Download mbox | patch
Permalink /patch/24407/
State New
Headers show

Comments

Adhemerval Zanella Netto - Nov. 21, 2017, 1:55 p.m.
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 (__glob): Use char_array for home directory.

Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
 ChangeLog    |  2 ++
 posix/glob.c | 66 ++++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 42 insertions(+), 26 deletions(-)
Andreas Schwab - Nov. 21, 2017, 2:24 p.m.
On Nov 21 2017, Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:

> @@ -645,44 +655,48 @@ __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;
> -		}
> +	      bool e = (err == 0 && char_array_set_str (&home_dir, p->pw_dir));
>  	      scratch_buffer_free (&s);
> -	      if (err == 0 && home_dir == NULL)
> +	      if (e == false)

!e


>  	  /* 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)

!e

Andreas.

Patch

diff --git a/posix/glob.c b/posix/glob.c
index aefdb28..71807d6 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -596,9 +596,14 @@  __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;
-	  if (home_dir == NULL || home_dir[0] == '\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))
+	    goto err_nospace;
+
+	  if (char_array_is_empty (&home_dir))
 	    {
 #ifdef WINDOWS32
 	      /* Windows NT defines HOMEDRIVE and HOMEPATH.  But give
@@ -608,16 +613,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;
@@ -645,44 +655,48 @@  __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;
-		}
+	      bool e = (err == 0 && char_array_set_str (&home_dir, p->pw_dir));
 	      scratch_buffer_free (&s);
-	      if (err == 0 && home_dir == NULL)
+	      if (e == false)
 		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;
 	}