From 1ef92685cf52b03935e0c235df1f97845710b587 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 14 Mar 2001 19:33:45 +0000
Subject: Yesterday I make strsep_space include post-token whitespace, so we
should not be adding another " " between tokens. -Erik
---
lash.c | 3 +--
sh.c | 3 +--
shell/lash.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lash.c b/lash.c
index 1977d5fdc..a3003abea 100644
--- a/lash.c
+++ b/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);
diff --git a/sh.c b/sh.c
index 1977d5fdc..a3003abea 100644
--- a/sh.c
+++ b/sh.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);
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);
--
cgit v1.2.3-55-g6feb