diff options
| author | Tom Tromey <tromey@cygnus.com> | 1998-10-22 16:30:34 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1998-10-22 16:30:34 +0000 |
| commit | 71f6a8e2e69c2e8625a18afa9318638e87a6197d (patch) | |
| tree | c41434d35bb694b5425a55169cd7fc73f7d24062 /gcc/java/lang.c | |
| parent | b18cfc286169fd26073ec1655f6a72d10fd6552d (diff) | |
| download | gcc-71f6a8e2e69c2e8625a18afa9318638e87a6197d.zip gcc-71f6a8e2e69c2e8625a18afa9318638e87a6197d.tar.gz gcc-71f6a8e2e69c2e8625a18afa9318638e87a6197d.tar.bz2 | |
jcf-path.c (add_entry): Don't add trailing separator if entry is a .zip file.
* jcf-path.c (add_entry): Don't add trailing separator if entry is
a .zip file.
(add_path): Don't add trailing separator to non-empty path
elements.
* lang.c (lang_decode_option): Check for -fclasspath and
-fCLASSPATH before examining other `-f' options.
From-SVN: r23229
Diffstat (limited to 'gcc/java/lang.c')
| -rw-r--r-- | gcc/java/lang.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gcc/java/lang.c b/gcc/java/lang.c index b425b8b..96debd0 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -126,6 +126,27 @@ lang_decode_option (argc, argv) char **argv; { char *p = argv[0]; + +#define CLARG "-fclasspath=" + if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) + { + jcf_path_classpath_arg (p + sizeof (CLARG) - 1); + return 1; + } +#undef CLARG +#define CLARG "-fCLASSPATH=" + else if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) + { + jcf_path_CLASSPATH_arg (p + sizeof (CLARG) - 1); + return 1; + } +#undef CLARG + else if (strncmp (p, "-I", 2) == 0) + { + jcf_path_include_arg (p + 2); + return 1; + } + if (p[0] == '-' && p[1] == 'f') { /* Some kind of -f option. @@ -183,26 +204,6 @@ lang_decode_option (argc, argv) return 1; } -#define CLARG "-fclasspath=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_classpath_arg (p + sizeof (CLARG)); - return 1; - } -#undef CLARG -#define CLARG "-fCLASSPATH=" - else if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_CLASSPATH_arg (p + sizeof (CLARG)); - return 1; - } -#undef CLARG - else if (strncmp (p, "-I", 2) == 0) - { - jcf_path_include_arg (p + 2); - return 1; - } - return 0; } |