diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-03-14 22:33:45 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-03-14 22:33:45 +0300 |
commit | 1ef92685cf52b03935e0c235df1f97845710b587 (patch) | |
tree | 9fe0194506ccc2a4ce30d72b82746424777e0bfb | |
parent | ce4a586edb6abd90c1036666159f831bd2a58895 (diff) |
Yesterday I make strsep_space include post-token whitespace,
so we should not be adding another " " between tokens.
-Erik
-rw-r--r-- | lash.c | 3 | ||||
-rw-r--r-- | sh.c | 3 | ||||
-rw-r--r-- | shell/lash.c | 3 |
3 files changed, 3 insertions, 6 deletions
@@ -1049,13 +1049,12 @@ static int expand_arguments(char *command) /* Convert from char** (one word per string) to a simple char*, * but don't overflow command which is BUFSIZ in length */ for (i=0; i < expand_result.gl_pathc; i++) { - length=strlen(expand_result.gl_pathv[i])+1; + length=strlen(expand_result.gl_pathv[i]); if (BUFSIZ-total_length-length <= 0) { error_msg(out_of_space); return FALSE; } strcat(command+total_length, expand_result.gl_pathv[i]); - strcat(command+total_length, " "); total_length+=length; } globfree (&expand_result); @@ -1049,13 +1049,12 @@ static int expand_arguments(char *command) /* Convert from char** (one word per string) to a simple char*, * but don't overflow command which is BUFSIZ in length */ for (i=0; i < expand_result.gl_pathc; i++) { - length=strlen(expand_result.gl_pathv[i])+1; + length=strlen(expand_result.gl_pathv[i]); if (BUFSIZ-total_length-length <= 0) { error_msg(out_of_space); return FALSE; } strcat(command+total_length, expand_result.gl_pathv[i]); - strcat(command+total_length, " "); total_length+=length; } globfree (&expand_result); diff --git a/shell/lash.c b/shell/lash.c index 1977d5fdc..a3003abea 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -1049,13 +1049,12 @@ static int expand_arguments(char *command) /* Convert from char** (one word per string) to a simple char*, * but don't overflow command which is BUFSIZ in length */ for (i=0; i < expand_result.gl_pathc; i++) { - length=strlen(expand_result.gl_pathv[i])+1; + length=strlen(expand_result.gl_pathv[i]); if (BUFSIZ-total_length-length <= 0) { error_msg(out_of_space); return FALSE; } strcat(command+total_length, expand_result.gl_pathv[i]); - strcat(command+total_length, " "); total_length+=length; } globfree (&expand_result); |