/* Handle CLASSPATH, -classpath, and path searching.
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006,
+ 2007, 2008 Free Software Foundation, Inc.
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GCC is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>.
Java and all Java-based marks are trademarks or registered trademarks
of Sun Microsystems, Inc. in the United States and other countries.
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "tm.h" /* FIXME: For GET_ENVIRONMENT from defaults.h. */
#include <dirent.h>
#include "jcf.h"
-/* By default, colon separates directories in a path. */
-#ifndef PATH_SEPARATOR
-#define PATH_SEPARATOR ':'
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
#ifndef DIR_UP
#define DIR_UP ".."
#endif
struct entry *next;
};
-static void free_entry PARAMS ((struct entry **));
-static void append_entry PARAMS ((struct entry **, struct entry *));
-static void add_entry PARAMS ((struct entry **, const char *, int));
-static void add_path PARAMS ((struct entry **, const char *, int));
+static void free_entry (struct entry **);
+static void append_entry (struct entry **, struct entry *);
+static void add_entry (struct entry **, const char *, int);
+static void add_path (struct entry **, const char *, int);
/* We support several different ways to set the class path.
\f
static void
-free_entry (entp)
- struct entry **entp;
+free_entry (struct entry **entp)
{
struct entry *e, *n;
}
static void
-append_entry (entp, ent)
- struct entry **entp;
- struct entry *ent;
+append_entry (struct entry **entp, struct entry *ent)
{
/* It doesn't matter if this is slow, since it is run only at
startup, and then infrequently. */
}
static void
-add_entry (entp, filename, is_system)
- struct entry **entp;
- const char *filename;
- int is_system;
+add_entry (struct entry **entp, const char *filename, int is_system)
{
int len;
struct entry *n;
- n = ALLOC (sizeof (struct entry));
+ n = XNEW (struct entry);
n->flags = is_system ? FLAG_SYSTEM : 0;
n->next = NULL;
len = strlen (filename);
- if (len > 4 && (strcmp (filename + len - 4, ".zip") == 0
- || strcmp (filename + len - 4, ".jar") == 0))
+
+ if (len > 4 && (FILENAME_CMP (filename + len - 4, ".zip") == 0
+ || FILENAME_CMP (filename + len - 4, ".jar") == 0))
{
n->flags |= FLAG_ZIP;
/* If the user uses -classpath then he'll have to include
libgcj.jar in the value. We check for this in a simplistic
way. Symlinks will fool this test. This is only used for
-MM and -MMD, so it probably isn't terribly important. */
- if (! strcmp (filename, LIBGCJ_ZIP_FILE))
+ if (! FILENAME_CMP (filename, LIBGCJ_ZIP_FILE))
n->flags |= FLAG_SYSTEM;
}
/* 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)
+ if (! IS_DIR_SEPARATOR (filename[len - 1]))
{
- char *f2 = alloca (len + 2);
+ char *f2 = (char *) alloca (len + 2);
strcpy (f2, filename);
f2[len] = DIR_SEPARATOR;
f2[len + 1] = '\0';
}
static void
-add_path (entp, cp, is_system)
- struct entry **entp;
- const char *cp;
- int is_system;
+add_path (struct entry **entp, const char *cp, int is_system)
{
const char *startp, *endp;
if (cp)
{
- char *buf = alloca (strlen (cp) + 3);
+ char *buf = (char *) alloca (strlen (cp) + 3);
startp = endp = cp;
while (1)
{
/* Initialize the path module. */
void
-jcf_path_init ()
+jcf_path_init (void)
{
char *cp;
- char *try, sep[2];
+ char *attempt, sep[2];
struct stat stat_b;
int found = 0, len;
GET_ENVIRONMENT (cp, "GCC_EXEC_PREFIX");
if (cp)
{
- try = alloca (strlen (cp) + 50);
+ attempt = (char *) alloca (strlen (cp) + 50);
/* The exec prefix can be something like
/usr/local/bin/../lib/gcc-lib/. We want to change this
into a pointer to the share/java directory. We support two
configurations: one where prefix and exec-prefix are the
same, and one where exec-prefix is `prefix/SOMETHING'. */
- strcpy (try, cp);
- strcat (try, DIR_UP);
- strcat (try, sep);
- strcat (try, DIR_UP);
- strcat (try, sep);
- len = strlen (try);
-
- strcpy (try + len, "share");
- strcat (try, sep);
- strcat (try, "java");
- strcat (try, sep);
- strcat (try, "libgcj-" DEFAULT_TARGET_VERSION ".jar");
- if (! stat (try, &stat_b))
+ strcpy (attempt, cp);
+ strcat (attempt, DIR_UP);
+ strcat (attempt, sep);
+ strcat (attempt, DIR_UP);
+ strcat (attempt, sep);
+ len = strlen (attempt);
+
+ strcpy (attempt + len, "share");
+ strcat (attempt, sep);
+ strcat (attempt, "java");
+ strcat (attempt, sep);
+ strcat (attempt, "libgcj-" DEFAULT_TARGET_VERSION ".jar");
+ if (! stat (attempt, &stat_b))
{
- add_entry (&sys_dirs, try, 1);
+ add_entry (&sys_dirs, attempt, 1);
found = 1;
- strcpy (&try[strlen (try)
- - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")],
+ strcpy (&attempt[strlen (attempt)
+ - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")],
sep);
- strcat (try, "ext");
- strcat (try, sep);
- if (! stat (try, &stat_b))
- jcf_path_extdirs_arg (try);
+ strcat (attempt, "ext");
+ strcat (attempt, sep);
+ if (! stat (attempt, &stat_b))
+ jcf_path_extdirs_arg (attempt);
}
else
{
- strcpy (try + len, DIR_UP);
- strcat (try, sep);
- strcat (try, "share");
- strcat (try, sep);
- strcat (try, "java");
- strcat (try, sep);
- strcat (try, "libgcj-" DEFAULT_TARGET_VERSION ".jar");
- if (! stat (try, &stat_b))
+ strcpy (attempt + len, DIR_UP);
+ strcat (attempt, sep);
+ strcat (attempt, "share");
+ strcat (attempt, sep);
+ strcat (attempt, "java");
+ strcat (attempt, sep);
+ strcat (attempt, "libgcj-" DEFAULT_TARGET_VERSION ".jar");
+ if (! stat (attempt, &stat_b))
{
- add_entry (&sys_dirs, try, 1);
+ add_entry (&sys_dirs, attempt, 1);
found = 1;
- strcpy (&try[strlen (try)
- - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")],
+ strcpy (&attempt[strlen (attempt)
+ - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")],
sep);
- strcat (try, "ext");
- strcat (try, sep);
- if (! stat (try, &stat_b))
- jcf_path_extdirs_arg (try);
+ strcat (attempt, "ext");
+ strcat (attempt, sep);
+ if (! stat (attempt, &stat_b))
+ jcf_path_extdirs_arg (attempt);
}
}
}
/* Desperation: use the installed one. */
char *extdirs;
add_entry (&sys_dirs, LIBGCJ_ZIP_FILE, 1);
- extdirs = alloca (strlen (LIBGCJ_ZIP_FILE) + 1);
+ extdirs = (char *) alloca (strlen (LIBGCJ_ZIP_FILE) + 1);
strcpy (extdirs, LIBGCJ_ZIP_FILE);
strcpy (&extdirs[strlen (LIBGCJ_ZIP_FILE)
- strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")],
This overrides only the $CLASSPATH environment variable.
*/
void
-jcf_path_classpath_arg (path)
- const char *path;
+jcf_path_classpath_arg (const char *path)
{
free_entry (&classpath_user);
add_path (&classpath_user, path, 0);
/* Call this when -bootclasspath is seen on the command line.
*/
void
-jcf_path_bootclasspath_arg (path)
- const char *path;
+jcf_path_bootclasspath_arg (const char *path)
{
free_entry (&sys_dirs);
add_path (&sys_dirs, path, 1);
/* Call this when -extdirs is seen on the command line.
*/
void
-jcf_path_extdirs_arg (cp)
- const char *cp;
+jcf_path_extdirs_arg (const char *cp)
{
const char *startp, *endp;
if (cp)
{
- char *buf = alloca (strlen (cp) + 3);
+ char *buf = (char *) alloca (strlen (cp) + 3);
startp = endp = cp;
while (1)
{
if (direntp->d_name[0] != '.')
{
- char *name = alloca (dirname_length
+ char *name = (char *) alloca (dirname_length
+ strlen (direntp->d_name) + 2);
strcpy (name, buf);
- if (name[dirname_length-1] != DIR_SEPARATOR)
+ if (! IS_DIR_SEPARATOR (name[dirname_length-1]))
{
name[dirname_length] = DIR_SEPARATOR;
name[dirname_length+1] = 0;
add_entry (&extensions, name, 0);
}
}
+ if (dirp)
+ closedir (dirp);
}
if (! *endp)
/* Call this when -I is seen on the command line. */
void
-jcf_path_include_arg (path)
- const char *path;
+jcf_path_include_arg (const char *path)
{
add_entry (&include_dirs, path, 0);
}
we provide a way to iterate through the sealed list. If PRINT is
true then we print the final class path to stderr. */
void
-jcf_path_seal (print)
- int print;
+jcf_path_seal (int print)
{
struct entry *secondary;
}
void *
-jcf_path_start ()
+jcf_path_start (void)
{
return (void *) sealed;
}
void *
-jcf_path_next (x)
- void *x;
+jcf_path_next (void *x)
{
struct entry *ent = (struct entry *) x;
return (void *) ent->next;
}
+static const char
+PATH_SEPARATOR_STR[] = {PATH_SEPARATOR, '\0'};
+
+char *
+jcf_path_compute (const char *prefix)
+{
+ struct entry *iter;
+ char *result;
+ int length = strlen (prefix) + 1;
+ int first;
+
+ for (iter = sealed; iter != NULL; iter = iter->next)
+ length += strlen (iter->name) + 1;
+
+ result = (char *) xmalloc (length);
+ strcpy (result, prefix);
+ first = 1;
+ for (iter = sealed; iter != NULL; iter = iter->next)
+ {
+ if (! first)
+ strcat (result, PATH_SEPARATOR_STR);
+ first = 0;
+ strcat (result, iter->name);
+ /* Ugly: we want to strip the '/' from zip entries when
+ computing a string classpath. */
+ if ((iter->flags & FLAG_ZIP) != 0)
+ result[strlen (result) - 1] = '\0';
+ }
+
+ return result;
+}
+
/* We guarantee that the return path will either be a zip file, or it
will end with a directory separator. */
char *
-jcf_path_name (x)
- void *x;
+jcf_path_name (void *x)
{
struct entry *ent = (struct entry *) x;
return ent->name;
}
int
-jcf_path_is_zipfile (x)
- void *x;
+jcf_path_is_zipfile (void *x)
{
struct entry *ent = (struct entry *) x;
return (ent->flags & FLAG_ZIP);
}
int
-jcf_path_is_system (x)
- void *x;
+jcf_path_is_system (void *x)
{
struct entry *ent = (struct entry *) x;
return (ent->flags & FLAG_SYSTEM);
}
int
-jcf_path_max_len ()
+jcf_path_max_len (void)
{
return longest_path;
}
OSDN Git Service
