Commit 25e8451e by Thomas Fitzsimmons Committed by Thomas Fitzsimmons

jartool.h (ACTION_INDEX): New macro.

2006-02-08  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jartool.h (ACTION_INDEX): New macro.
	* jartool.c (main): Handle -i option.
	* fastjar.texi (Invoking fastjar): Add description of -i option.

From-SVN: r110739
parent 77f6ec05
2006-02-08 Thomas Fitzsimmons <fitzsim@redhat.com>
* jartool.h (ACTION_INDEX): New macro.
* jartool.c (main): Handle -i option.
* fastjar.texi (Invoking fastjar): Add description of -i option.
2006-01-31 Tom Tromey <tromey@redhat.com> 2006-01-31 Tom Tromey <tromey@redhat.com>
* jartool.c (version): Use 2006. * jartool.c (version): Use 2006.
......
...@@ -150,6 +150,10 @@ in the GCC version. ...@@ -150,6 +150,10 @@ in the GCC version.
@item -M @item -M
Do not create a manifest file for the entries. Do not create a manifest file for the entries.
@item -i
Generate an index of the packages in this jar and its Class-Path
(currently a no-op for jar command-line compatibility).
@item -0 @item -0
Store only; use no ZIP compression. Store only; use no ZIP compression.
......
...@@ -321,7 +321,7 @@ ub4 end_of_entries; ...@@ -321,7 +321,7 @@ ub4 end_of_entries;
#define OPT_HELP LONG_OPT (0) #define OPT_HELP LONG_OPT (0)
/* This holds all options. */ /* This holds all options. */
#define OPTION_STRING "-ctxuvVf:m:C:0ME@" #define OPTION_STRING "-ctxuvVf:m:C:0MiE@"
/* Define the MANIFEST content here to have it easier with calculations /* Define the MANIFEST content here to have it easier with calculations
below. This is for the case we create an empty MANIFEST.MF. */ below. This is for the case we create an empty MANIFEST.MF. */
...@@ -407,6 +407,9 @@ int main(int argc, char **argv) ...@@ -407,6 +407,9 @@ int main(int argc, char **argv)
case 'M': case 'M':
manifest = FALSE; manifest = FALSE;
break; break;
case 'i':
action = ACTION_INDEX;
break;
case OPT_HELP: case OPT_HELP:
help(argv[0]); help(argv[0]);
...@@ -424,6 +427,13 @@ int main(int argc, char **argv) ...@@ -424,6 +427,13 @@ int main(int argc, char **argv)
} }
} }
if(verbose && action == ACTION_INDEX)
fprintf(stderr, "Warning: '-i' option is currently a no-op\n");
/* FIXME: implement -i option. */
if(action == ACTION_INDEX)
exit(0);
/* We might have seen `--'. In this case we want to make sure that /* We might have seen `--'. In this case we want to make sure that
all following options are handled as file names. */ all following options are handled as file names. */
while (optind < argc) while (optind < argc)
...@@ -2249,6 +2259,8 @@ Store many files together in a single `jar' file.\n\ ...@@ -2249,6 +2259,8 @@ Store many files together in a single `jar' file.\n\
printf("\ printf("\
-m FILE include manifest information from specified manifest file\n\ -m FILE include manifest information from specified manifest file\n\
-M Do not create a manifest file for the entries\n\ -M Do not create a manifest file for the entries\n\
-i generate an index of the packages in this jar\n\
and its Class-Path (currently unimplemented)\n\
-v generate verbose output on standard output\n\ -v generate verbose output on standard output\n\
-V, --version display version information\n\ -V, --version display version information\n\
"); ");
......
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
#define ACTION_EXTRACT 2 #define ACTION_EXTRACT 2
#define ACTION_UPDATE 3 #define ACTION_UPDATE 3
#define ACTION_LIST 4 #define ACTION_LIST 4
#define ACTION_INDEX 5
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment