mirrors/busybox
0
0
Fork 0
mirror of https://git.busybox.net/busybox.git synced 2024-11-29 00:23:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory problems, and make behavior correct.

Browse Source
This commit is contained in:
Eric Andersen 2000-09-23 19:53:31 +00:00
parent 6d66817b6b
commit 96bdde97fb
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
findutils/xargs.c
View File

@ -78,13 +78,16 @@ int xargs_main(int argc, char **argv)
/* Now, read in one line at a time from stdin, and run command+args on it */ /* Now, read in one line at a time from stdin, and run command+args on it */
in_from_stdin = get_line_from_file(stdin); in_from_stdin = get_line_from_file(stdin);
for (;in_from_stdin!=NULL;) { for (;in_from_stdin!=NULL;) {
char *tmp;
len = strlen(in_from_stdin) + len_args_from_cmdline; len = strlen(in_from_stdin) + len_args_from_cmdline;
if ( len > len_cmd_to_be_executed ) { len_cmd_to_be_executed+=len+3;
len_cmd_to_be_executed=len+3; cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed);
cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed);
} /* Strip out any \n's, so we just get one command to run */
while( (tmp = strchr(in_from_stdin, '\n')) != NULL )
*tmp=' ';
strcat(cmd_to_be_executed, in_from_stdin); strcat(cmd_to_be_executed, in_from_stdin);
strcat(cmd_to_be_executed+strlen(cmd_to_be_executed)-2, " ");
strcat(cmd_to_be_executed, " "); strcat(cmd_to_be_executed, " ");
free(in_from_stdin); free(in_from_stdin);

13
xargs.c
View File

@ -78,13 +78,16 @@ int xargs_main(int argc, char **argv)
/* Now, read in one line at a time from stdin, and run command+args on it */ /* Now, read in one line at a time from stdin, and run command+args on it */
in_from_stdin = get_line_from_file(stdin); in_from_stdin = get_line_from_file(stdin);
for (;in_from_stdin!=NULL;) { for (;in_from_stdin!=NULL;) {
char *tmp;
len = strlen(in_from_stdin) + len_args_from_cmdline; len = strlen(in_from_stdin) + len_args_from_cmdline;
if ( len > len_cmd_to_be_executed ) { len_cmd_to_be_executed+=len+3;
len_cmd_to_be_executed=len+3; cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed);
cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed);
} /* Strip out any \n's, so we just get one command to run */
while( (tmp = strchr(in_from_stdin, '\n')) != NULL )
*tmp=' ';
strcat(cmd_to_be_executed, in_from_stdin); strcat(cmd_to_be_executed, in_from_stdin);
strcat(cmd_to_be_executed+strlen(cmd_to_be_executed)-2, " ");
strcat(cmd_to_be_executed, " "); strcat(cmd_to_be_executed, " ");
free(in_from_stdin); free(in_from_stdin);