Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Yesterday I make strsep_space include post-token whitespace,

Browse Source 
so we should not be adding another " " between tokens.
 -Erik
This commit is contained in:
Eric Andersen 2001-03-14 19:33:45 +00:00
parent ce4a586edb
commit 1ef92685cf
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lash.c
View File

@ -1049,13 +1049,12 @@ static int expand_arguments(char *command)
/* Convert from char** (one word per string) to a simple char*, /* Convert from char** (one word per string) to a simple char*,
* but don't overflow command which is BUFSIZ in length */ * but don't overflow command which is BUFSIZ in length */
for (i=0; i < expand_result.gl_pathc; i++) { 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) { if (BUFSIZ-total_length-length <= 0) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
strcat(command+total_length, " ");
total_length+=length; total_length+=length;
} }
globfree (&expand_result); globfree (&expand_result);

3
sh.c
View File

@ -1049,13 +1049,12 @@ static int expand_arguments(char *command)
/* Convert from char** (one word per string) to a simple char*, /* Convert from char** (one word per string) to a simple char*,
* but don't overflow command which is BUFSIZ in length */ * but don't overflow command which is BUFSIZ in length */
for (i=0; i < expand_result.gl_pathc; i++) { 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) { if (BUFSIZ-total_length-length <= 0) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
strcat(command+total_length, " ");
total_length+=length; total_length+=length;
} }
globfree (&expand_result); globfree (&expand_result);

3
shell/lash.c
View File

@ -1049,13 +1049,12 @@ static int expand_arguments(char *command)
/* Convert from char** (one word per string) to a simple char*, /* Convert from char** (one word per string) to a simple char*,
* but don't overflow command which is BUFSIZ in length */ * but don't overflow command which is BUFSIZ in length */
for (i=0; i < expand_result.gl_pathc; i++) { 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) { if (BUFSIZ-total_length-length <= 0) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
strcat(command+total_length, " ");
total_length+=length; total_length+=length;
} }
globfree (&expand_result); globfree (&expand_result);