jar -C fix

From-SVN: r50009
This commit is contained in:
Anthony Green 2002-02-24 19:59:46 +00:00 committed by Anthony Green
parent 3387d36e96
commit b9f8d427a8
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,7 @@
2002-02-23 Anthony Green <green@redhat.com>
* jartool.c (main): Fix handling of -C.
2002-01-30 Tom Tromey <tromey@redhat.com>
* jartool.c (main): NULL-terminate new_argv. Pass 0 as argument

View file

@ -303,8 +303,8 @@ int number_of_entries; /* number of entries in the linked list */
#define OPT_HELP LONG_OPT (0)
/* This holds all options except `-C', which is handled specially. */
#define OPTION_STRING "-ctxuvVf:m:0ME@"
/* This holds all options. */
#define OPTION_STRING "-ctxuvVf:m:C:0ME@"
static const struct option options[] =
{
@ -348,9 +348,11 @@ int main(int argc, char **argv){
while ((opt = getopt_long (argc, argv, OPTION_STRING,
options, NULL)) != -1) {
switch(opt){
case 'C':
new_argv[new_argc++] = (char *) "-C";
/* ... fall through ... */
case 1:
/* File name or unparsed option, due to RETURN_IN_ORDER. In
particular `-C' is handled here and not elsewhere. */
/* File name or unparsed option, due to RETURN_IN_ORDER. */
new_argv[new_argc++] = optarg;
break;
case 'c':