MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jcf-io.c (find_class): Added explanatory comment.

Browse Source 
* jcf-io.c (find_class): Added explanatory comment.
	* jcf-path.c (add_entry): Look for `.zip' at end of filename.  Add
	trailing slash to `.zip' entries.

From-SVN: r23615
This commit is contained in:
Tom Tromey 1998-11-12 11:43:19 +00:00 committed by Tom Tromey
parent dfded5c3ba
commit 733b3a87ca
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,5 +1,10 @@
1998-11-12 Tom Tromey <tromey@cygnus.com>
* jcf-io.c (find_class): Added explanatory comment.
* jcf-path.c (add_entry): Look for `.zip' at end of filename. Add
trailing slash to `.zip' entries.
* jvspec.c (lang_specific_driver): Correctly handle case where
GC_NAME not defined.

2
gcc/java/jcf-io.c
View File

@ -282,6 +282,8 @@ DEFUN(find_class, (classname, classname_length, jcf, do_class_file),
strcpy (buffer, jcf_path_name (entry));
i = strlen (buffer);
/* This is right because we know that `.zip' entries will have a
trailing slash. See jcf-path.c. */
dir_len = i - 1;
for (k = 0; k < classname_length; k++, i++)

9
gcc/java/jcf-path.c
View File

@ -141,7 +141,7 @@ add_entry (entp, filename, is_system)
n->next = NULL;
len = strlen (filename);
if (len > 4 && ! strcmp (filename - 4, ".zip"))
if (len > 4 && ! strcmp (filename + len - 4, ".zip"))
{
n->flags |= FLAG_ZIP;
/* If the user uses -classpath then he'll have to include
@ -152,9 +152,10 @@ add_entry (entp, filename, is_system)
n->flags |= FLAG_SYSTEM;
}
if (! (n->flags & FLAG_ZIP)
&& filename[len - 1] != '/'
&& filename[len - 1] != DIR_SEPARATOR)
/* Note that we add a trailing separator to `.zip' names as well.
This is a little hack that lets the searching code in jcf-io.c
work more easily. Eww. */
if (filename[len - 1] != '/' && filename[len - 1] != DIR_SEPARATOR)
{
char *f2 = (char *) alloca (len + 1);
strcpy (f2, filename);