about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/generic/wordexp.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f94ea9656..9cd57b25b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/generic/wordexp.c: Undo last patch.  Use strndupa instead.
+
+	* po/sk.po: Update from translation team.
+
 2001-06-05  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Recognize
diff --git a/sysdeps/generic/wordexp.c b/sysdeps/generic/wordexp.c
index dcd724ef4f..ce81ef1910 100644
--- a/sysdeps/generic/wordexp.c
+++ b/sysdeps/generic/wordexp.c
@@ -346,7 +346,7 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length,
   else
     {
       /* Look up user name in database to get home directory */
-      char *user = __strndup (&words[1 + *offset], i - (1 + *offset));
+      char *user = strndupa (&words[1 + *offset], i - (1 + *offset));
       struct passwd pwd, *tpwd;
       int buflen = 1000;
       char* buffer = __alloca (buflen);
@@ -370,7 +370,6 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length,
 	}
 
       *offset = i - 1;
-      free (user);
     }
   return *word ? 0 : WRDE_NOSPACE;
 }