Fix from Larry for glob problems.

 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@2114 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 1 deletions

diff --git a/sh.c b/sh.c
index a3003abea..6fedfe8dd 100644
--- a/sh.c
+++ b/sh.c
@@ -1050,10 +1050,14 @@ static int expand_arguments(char *command)
                          * 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]);
-                                        if (BUFSIZ-total_length-length <= 0) {
+                                        if (total_length+length+1 >= BUFSIZ) {
                                                 error_msg(out_of_space);
                                                 return FALSE;
                                         }
+                                        if (i>0) {
+                                                strcat(command+total_length, " ");
+                                                total_length+=1;
+                                        }
                                         strcat(command+total_length, expand_result.gl_pathv[i]);
                                         total_length+=length;
                                 }