diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-09-23 19:53:31 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-09-23 19:53:31 +0000 |
| commit | 96bdde97fb7ebb44a89404bb87dc8e8cd4ec7446 (patch) | |
| tree | 0ca8189e67b96c03195193b6b2d060a8aa47b538 /findutils/xargs.c | |
| parent | 6d66817b6bcc237c24c6aeb37af1407b36f49f9f (diff) | |
| download | busybox-w32-96bdde97fb7ebb44a89404bb87dc8e8cd4ec7446.tar.gz busybox-w32-96bdde97fb7ebb44a89404bb87dc8e8cd4ec7446.tar.bz2 busybox-w32-96bdde97fb7ebb44a89404bb87dc8e8cd4ec7446.zip | |
Fix memory problems, and make behavior correct.
Diffstat (limited to 'findutils/xargs.c')
| -rw-r--r-- | findutils/xargs.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c index 24daf5085..bf68cf768 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
| @@ -78,13 +78,16 @@ int xargs_main(int argc, char **argv) | |||
| 78 | /* Now, read in one line at a time from stdin, and run command+args on it */ | 78 | /* Now, read in one line at a time from stdin, and run command+args on it */ |
| 79 | in_from_stdin = get_line_from_file(stdin); | 79 | in_from_stdin = get_line_from_file(stdin); |
| 80 | for (;in_from_stdin!=NULL;) { | 80 | for (;in_from_stdin!=NULL;) { |
| 81 | char *tmp; | ||
| 81 | len = strlen(in_from_stdin) + len_args_from_cmdline; | 82 | len = strlen(in_from_stdin) + len_args_from_cmdline; |
| 82 | if ( len > len_cmd_to_be_executed ) { | 83 | len_cmd_to_be_executed+=len+3; |
| 83 | len_cmd_to_be_executed=len+3; | 84 | cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed); |
| 84 | cmd_to_be_executed=xrealloc(cmd_to_be_executed, len_cmd_to_be_executed); | 85 | |
| 85 | } | 86 | /* Strip out any \n's, so we just get one command to run */ |
| 87 | while( (tmp = strchr(in_from_stdin, '\n')) != NULL ) | ||
| 88 | *tmp=' '; | ||
| 89 | |||
| 86 | strcat(cmd_to_be_executed, in_from_stdin); | 90 | strcat(cmd_to_be_executed, in_from_stdin); |
| 87 | strcat(cmd_to_be_executed+strlen(cmd_to_be_executed)-2, " "); | ||
| 88 | strcat(cmd_to_be_executed, " "); | 91 | strcat(cmd_to_be_executed, " "); |
| 89 | 92 | ||
| 90 | free(in_from_stdin); | 93 | free(in_from_stdin); |