emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix from Larry for glob problems.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-03-15 23:01:19 +00:00
parent c5b3242d3d
commit 4aaefc2a50
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lash.c
View File

@ -1050,10 +1050,14 @@ static int expand_arguments(char *command)
* 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]); length=strlen(expand_result.gl_pathv[i]);
if (BUFSIZ-total_length-length <= 0) { if (total_length+length+1 >= BUFSIZ) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
if (i>0) {
strcat(command+total_length, " ");
total_length+=1;
}
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
total_length+=length; total_length+=length;
} }

6
sh.c
View File

@ -1050,10 +1050,14 @@ static int expand_arguments(char *command)
* 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]); length=strlen(expand_result.gl_pathv[i]);
if (BUFSIZ-total_length-length <= 0) { if (total_length+length+1 >= BUFSIZ) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
if (i>0) {
strcat(command+total_length, " ");
total_length+=1;
}
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
total_length+=length; total_length+=length;
} }

6
shell/lash.c
View File

@ -1050,10 +1050,14 @@ static int expand_arguments(char *command)
* 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]); length=strlen(expand_result.gl_pathv[i]);
if (BUFSIZ-total_length-length <= 0) { if (total_length+length+1 >= BUFSIZ) {
error_msg(out_of_space); error_msg(out_of_space);
return FALSE; return FALSE;
} }
if (i>0) {
strcat(command+total_length, " ");
total_length+=1;
}
strcat(command+total_length, expand_result.gl_pathv[i]); strcat(command+total_length, expand_result.gl_pathv[i]);
total_length+=length; total_length+=length;
} }