summary refs log tree commit diff
path: root/posix/wordexp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-12 17:26:19 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-12 17:26:19 +0000
commit8d9618b7f6ecbcd04fd572140bbecaf9be10d376 (patch)
treece9f6b373142f8875c9d6a4543e20c732afab18a /posix/wordexp.c
parenteb13b9a02d939ee7440472c5a5f86e55f3adbd54 (diff)
downloadglibc-8d9618b7f6ecbcd04fd572140bbecaf9be10d376.tar.gz
glibc-8d9618b7f6ecbcd04fd572140bbecaf9be10d376.tar.xz
glibc-8d9618b7f6ecbcd04fd572140bbecaf9be10d376.zip
Update.
1998-03-12 13:11  Tim Waugh  <tim@cyberelk.demon.co.uk>

	* posix/wordexp-test.c: More tests.
	(main): Set up arena for pathname expansion tests (in a temporary
	directory).
	(testit): Don't check word count or word vector if return value is
	non-zero.

	* posix/wordexp.c (exec_comm): Always chop off terminating
	linefeed (just like bash does).
	(parse_param): Change lots of occurrences of "if (!*env)" to "if
	(!env || !*env)".
	(parse_param): For assignment inside parameter expansion, use all
	expanded words in assignment rather than just the first.
	(parse_param): Corrected return value for parameter expansion of
	an unset variable when WRDE_UNDEF is in effect.
	(parse_dollars): Don't field-split if quoted.
	(wordexp): Opening brace character isn't allowed unquoted.

1998-03-12  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dlerror.c: Fix concurrency problems with error string and
	number.

	* elf/dl-deps.c (_dl_map_object_deps): Print debug info when
	filter/auxiliary are being loaded.

1998-03-12 14:24  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dlerror.c (last_object_name): Removed.
	(dlerror): Don't use last_object_name.
	(_dl_error_run): Omit second argument to _dl_catch_error.
	* elf/dl-error.c (struct catch): Remove objname member.
	(_dl_signal_error): Construct string including objname when given.
	(_dl_catch_error): Remove objname handling.
	* elf/link.h (_dl_catch_error): Fix prototype and comment.
	* elf/rtld.c (dl_main): Call _dl_catch_error correctly.
	* elf/dl-deps.c (_dl_map_objet_deps): Likewise.
	* nss/nsswitch.c (nss_dlerror_run): Likewise.
	* iconv/gconv_dl.c (dlerror_run): Likewise.
	[Corrects PR libc/501].
Diffstat (limited to 'posix/wordexp.c')
-rw-r--r--posix/wordexp.c60
1 files changed, 45 insertions, 15 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 869598ade8..a72a677101 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -831,6 +831,11 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
 	}
 
       close (fildes[0]);
+
+      /* bash chops off a terminating linefeed, which seems sensible */
+      if ((*word)[*word_length - 1] == '\n')
+	(*word)[--*word_length] = '\0';
+
       return 0;
     }
   else
@@ -1100,7 +1105,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
 	  break;
 
 	case '%':
-	  if (!*env)
+	  if (!env || !*env)
 	    goto syntax;
 
 	  /* Separating variable name from suffix pattern? */
@@ -1124,7 +1129,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
 	  break;
 
 	case ':':
-	  if (!*env)
+	  if (!env || !*env)
 	    goto syntax;
 
 	  if (action != '\0' || remove != RP_NONE)
@@ -1150,7 +1155,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
 	case '=':
 	case '?':
 	case '+':
-	  if (!*env)
+	  if (!env || !*env)
 	    goto syntax;
 
 	  if (substitute_length)
@@ -1252,14 +1257,16 @@ envsubst:
       if (!quoted || *env == '*')
 	{
 	  /* Build up value parameter by parameter (copy them) */
-	  for (p = 1; __libc_argv[p]; p++)
+	  for (p = 1; __libc_argv[p]; ++p)
 	    {
-	      char * old_pointer = value;
+	      char *old_pointer = value;
+	      size_t argv_len = strlen (__libc_argv[p]);
+	      size_t old_plist_len = plist_len;
 
 	      if (value)
 		value[plist_len - 1] = 0;
 
-	      plist_len += 1 + strlen (__libc_argv[p]);
+	      plist_len += 1 + argv_len;
 
 	      /* First realloc will act as malloc because value is
 	       * initialised to NULL. */
@@ -1270,7 +1277,7 @@ envsubst:
 		  return WRDE_NOSPACE;
 		}
 
-	      strcat (value, __libc_argv[p]);
+	      memcpy (&value[old_plist_len - 1], __libc_argv[p], argv_len + 1);
 	      if (__libc_argv[p + 1])
 		{
 		  value[plist_len - 1] = '\0';
@@ -1497,16 +1504,38 @@ envsubst:
 		  == WRDE_NOSPACE)
 		break;
 
+	    if (i < we.we_wordc)
+	      {
+		/* Ran out of space */
+		wordfree (&we);
+		goto no_space;
+	      }
+
 	    if (action == '=')
-	      /* Also assign */
-	      setenv (env, we.we_wordv[0], 1); /* need to strdup? */
+	      {
+		char *words;
+		char *cp;
+		size_t words_size = 0;
 
-	    wordfree (&we);
+		for (i = 0; i < we.we_wordc; i++)
+		  words_size += strlen (we.we_wordv[i]) + 1; /* for <space> */
+		words_size++;
 
-	    if (i < we.we_wordc)
-	      /* Ran out of space */
-	      goto no_space;
+		cp = words = __alloca (words_size);
+		*words = 0;
+		for (i = 0; i < we.we_wordc - 1; i++)
+		  {
+		    cp = __stpcpy (cp, we.we_wordv[i]);
+		    *cp++ = ' ';
+		  }
 
+		__stpcpy (cp, we.we_wordv[i]);
+
+		/* Also assign */
+		setenv (env, words, 1);
+	      }
+
+	    wordfree (&we);
 	    return 0;
 	  }
 
@@ -1550,7 +1579,7 @@ envsubst:
     {
       /* Variable not defined */
       if (flags & WRDE_UNDEF)
-	return WRDE_SYNTAX;
+	return WRDE_BADVAL;
 
       return 0;
     }
@@ -1694,7 +1723,7 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,
 
       (*offset) += 2;
       return parse_comm (word, word_length, max_length, words, offset, flags,
-			 pwordexp, ifs, ifs_white);
+			 quoted? NULL : pwordexp, ifs, ifs_white);
 
     case '[':
       (*offset) += 2;
@@ -1946,6 +1975,7 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
       case '>':
       case '(':
       case ')':
+	case '{':
       case '}':
 	/* Fail */
 	wordfree (pwordexp);