Yesterday I make strsep_space include post-token whitespace,

so we should not be adding another " " between tokens.
 -Erik

diff --git a/lash.c b/lash.c
index 1977d5fdcba0f632bdf65e891cca576d80da8941..a3003abeae6d9e4c06047e7d4c28661d28490703 100644 (file)
--- 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 1977d5fdcba0f632bdf65e891cca576d80da8941..a3003abeae6d9e4c06047e7d4c28661d28490703 100644 (file)
--- 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 1977d5fdcba0f632bdf65e891cca576d80da8941..a3003abeae6d9e4c06047e7d4c28661d28490703 100644 (file)
--- 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);