OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jartool.c (expand_options): Handle tar-style argument list with a leading "-". 

* jartool.c (expand_options): Handle tar-style argument list with a
	leading "-".

From-SVN: r50958
This commit is contained in:
Bryce McKinlay 2002-03-18 11:08:59 +00:00 committed by Bryce McKinlay
parent 67431c64e5
commit ad3bf85ab7
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastjar/ChangeLog
View File

@ -1,3 +1,8 @@
2002-03-18 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* jartool.c (expand_options): Handle tar-style argument list with a
leading "-".
2002-02-23 Anthony Green <green@redhat.com>
* jartool.c (main): Fix handling of -C.

17
fastjar/jartool.c
View File

@ -1938,24 +1938,34 @@ expand_options (int *argcp, char ***argvp)
int argc = *argcp;
char **argv = *argvp;
if (argc > 1 && argv[1][0] != '-')
/* Accept arguments with a leading "-" (eg "-cvf"), but don't do expansion
if a long argument (like "--help") is detected. */
if (argc > 1 && argv[1][1] != '-')
{
char buf[3];
char **new_argv;
int new_argc;
int args_to_expand;
char *p;
char **in, **out;
buf[0] = '-';
buf[2] = '\0';
new_argc = argc - 1 + strlen (argv[1]);
args_to_expand = strlen (argv[1]);
if (argv[1][0] == '-')
--args_to_expand;
new_argc = argc - 1 + args_to_expand;
new_argv = (char **) malloc (new_argc * sizeof (char *));
in = argv;
out = new_argv;
*out++ = *in++;
for (p = *in++; *p; ++p)
p = *in++;
if (*p == '-')
p++;
while (*p != '\0')
{
char *opt;
buf[1] = *p;
@ -1974,6 +1984,7 @@ expand_options (int *argcp, char ***argvp)
usage(argv[0]);
}
}
++p;
}
/* Copy remaining options. */