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

Fix xargs option parsing

Browse Source
This commit is contained in:
Eric Andersen 2000-09-24 01:12:54 +00:00
parent 1b1cfde1f8
commit 9ae3838657
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
findutils/xargs.c
View File

@ -37,8 +37,12 @@ int xargs_main(int argc, char **argv)
char traceflag = 0;
int len_args_from_cmdline, len_cmd_to_be_executed, len, opt;
while ((opt = getopt(argc, argv, "t")) != EOF) {
switch (opt) {
/* Note that we do not use getopt here, since
* we only want to interpret initial options,
* not options passed to commands */
while (--argc && **(++argv) == '-') {
while (*++(*argv)) {
switch (**argv) {
case 't':
traceflag=1;
break;
@ -46,25 +50,26 @@ int xargs_main(int argc, char **argv)
fatalError(xargs_usage);
}
}
}
/* Store the command and arguments to be executed (from the command line) */
if (optind == argc) {
if (argc == 1) {
len_args_from_cmdline = 6;
args_from_cmdline = xmalloc(len_args_from_cmdline);
strcat(args_from_cmdline, "echo ");
} else {
opt=strlen(argv[optind]);
opt=strlen(*argv);
len_args_from_cmdline = (opt > 10)? opt : 10;
args_from_cmdline = xcalloc(len_args_from_cmdline, sizeof(char));
for (; optind < argc; optind++) {
if (strlen(argv[optind]) + strlen(args_from_cmdline) >
while (argc-- > 0) {
if (strlen(*argv) + strlen(args_from_cmdline) >
len_args_from_cmdline) {
len_args_from_cmdline += strlen(argv[optind]);
len_args_from_cmdline += strlen(*argv);
args_from_cmdline =
xrealloc(args_from_cmdline,
len_args_from_cmdline+1);
}
strcat(args_from_cmdline, argv[optind]);
strcat(args_from_cmdline, *argv);
strcat(args_from_cmdline, " ");
}
}

21
xargs.c
View File

@ -37,8 +37,12 @@ int xargs_main(int argc, char **argv)
char traceflag = 0;
int len_args_from_cmdline, len_cmd_to_be_executed, len, opt;
while ((opt = getopt(argc, argv, "t")) != EOF) {
switch (opt) {
/* Note that we do not use getopt here, since
* we only want to interpret initial options,
* not options passed to commands */
while (--argc && **(++argv) == '-') {
while (*++(*argv)) {
switch (**argv) {
case 't':
traceflag=1;
break;
@ -46,25 +50,26 @@ int xargs_main(int argc, char **argv)
fatalError(xargs_usage);
}
}
}
/* Store the command and arguments to be executed (from the command line) */
if (optind == argc) {
if (argc == 1) {
len_args_from_cmdline = 6;
args_from_cmdline = xmalloc(len_args_from_cmdline);
strcat(args_from_cmdline, "echo ");
} else {
opt=strlen(argv[optind]);
opt=strlen(*argv);
len_args_from_cmdline = (opt > 10)? opt : 10;
args_from_cmdline = xcalloc(len_args_from_cmdline, sizeof(char));
for (; optind < argc; optind++) {
if (strlen(argv[optind]) + strlen(args_from_cmdline) >
while (argc-- > 0) {
if (strlen(*argv) + strlen(args_from_cmdline) >
len_args_from_cmdline) {
len_args_from_cmdline += strlen(argv[optind]);
len_args_from_cmdline += strlen(*argv);
args_from_cmdline =
xrealloc(args_from_cmdline,
len_args_from_cmdline+1);
}
strcat(args_from_cmdline, argv[optind]);
strcat(args_from_cmdline, *argv);
strcat(args_from_cmdline, " ");
}
}