From 4aaefc2a50600f2b2247ec2d607c19896e9cc0df Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 15 Mar 2001 23:01:19 +0000
Subject: Fix from Larry for glob problems.  -Erik

---
 shell/lash.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'shell')

diff --git a/shell/lash.c b/shell/lash.c
index a3003abea..6fedfe8dd 100644
--- a/shell/lash.c
+++ b/shell/lash.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;
 				}
-- 
cgit v1.2.3