* jcf-dump.c (main): Correctly recognize `--'-style long options.

From-SVN: r23607
This commit is contained in:
Tom Tromey 1998-11-11 13:52:49 +00:00 committed by Tom Tromey
parent 2a55b8e817
commit 233f10d3f1
2 changed files with 29 additions and 27 deletions

View File

@ -1,3 +1,7 @@
1998-11-11 Tom Tromey <tromey@cygnus.com>
* jcf-dump.c (main): Correctly recognize `--'-style long options.
Tue Nov 10 12:34:03 1998 Alexandre Petit-Bianco <apbianco@cygnus.com>
* class.c (is_compiled_class): Call safe_layout_class for class

View File

@ -718,39 +718,37 @@ DEFUN(main, (argc, argv),
{
char *arg = argv[argi];
/* Just let all arguments be given in either "-" or "--" form. */
if (arg[0] != '-' || ! strcmp (arg, "--"))
break;
if (arg[0] == '-')
/* Just let all arguments be given in either "-" or "--" form. */
if (arg[1] == '-')
++arg;
if (strcmp (arg, "-o") == 0 && argi + 1 < argc)
output_file = argv[++argi];
else if (strcmp (arg, "-classpath") == 0 && argi + 1 < argc)
jcf_path_classpath_arg (argv[++argi]);
else if (strcmp (arg, "-CLASSPATH") == 0 && argi + 1 < argc)
jcf_path_CLASSPATH_arg (argv[++argi]);
else if (strncmp (arg, "-I", 2) == 0)
jcf_path_include_arg (arg + 2);
else if (strcmp (arg, "-verbose") == 0)
verbose++;
else if (strcmp (arg, "-print-main") == 0)
flag_print_main++;
else if (strcmp (arg, "-c") == 0)
flag_disassemble_methods++;
else if (strcmp (arg, "-javap") == 0)
{
if (strcmp (arg, "-o") == 0 && argi + 1 < argc)
output_file = argv[++argi];
else if (strcmp (arg, "-classpath") == 0 && argi + 1 < argc)
jcf_path_classpath_arg (argv[++argi]);
else if (strcmp (arg, "-CLASSPATH") == 0 && argi + 1 < argc)
jcf_path_CLASSPATH_arg (argv[++argi]);
else if (strncmp (arg, "-I", 2) == 0)
jcf_path_include_arg (arg + 2);
else if (strcmp (arg, "-verbose") == 0)
verbose++;
else if (strcmp (arg, "-print-main") == 0)
flag_print_main++;
else if (strcmp (arg, "-c") == 0)
flag_disassemble_methods++;
else if (strcmp (arg, "-javap") == 0)
{
flag_javap_compatible++;
flag_print_constant_pool = 0;
}
else
{
fprintf (stderr, "%s: illegal argument\n", argv[argi]);
exit (FATAL_EXIT_CODE);
}
flag_javap_compatible++;
flag_print_constant_pool = 0;
}
else
break;
{
fprintf (stderr, "%s: illegal argument\n", argv[argi]);
exit (FATAL_EXIT_CODE);
}
}
if (argi == argc)