From 0213df7111578c134aaa805e82d69ebc6d84d3a4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 21 Jan 2005 13:11:05 +0000 Subject: [PATCH] New module 'classpath'. --- ChangeLog | 5 +++ MODULES.html.sh | 6 +-- lib/ChangeLog | 5 +++ lib/classpath.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/classpath.h | 34 +++++++++++++++ modules/classpath | 26 ++++++++++++ 6 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 lib/classpath.c create mode 100644 lib/classpath.h create mode 100644 modules/classpath diff --git a/ChangeLog b/ChangeLog index e0768c1a6..c0501a112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-21 Bruno Haible + + * modules/classpath: New file. + * MODULES.html.sh (Java): Add classpath. + 2005-01-20 Paul Eggert * MODULES.html.sh (Command-line arguments): Add version-etc-fsf. diff --git a/MODULES.html.sh b/MODULES.html.sh index c6b29c3b6..4fc245b35 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1942,12 +1942,12 @@ func_all_modules () func_wrap H3 func_echo "$element" - #func_begin_table - #func_module classpath + func_begin_table + func_module classpath #func_module javacomp #func_module javaexec #func_module gcj - #func_end_table + func_end_table element="Misc" element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"` diff --git a/lib/ChangeLog b/lib/ChangeLog index 8f7c818c4..05858c2fd 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-01-21 Bruno Haible + + * classpath.h: New file, from GNU gettext. + * classpath.c: New file, from GNU gettext. + 2005-01-20 Simon Josefsson * version-etc-fsf.c: New file, with version_etc_copyright. diff --git a/lib/classpath.c b/lib/classpath.c new file mode 100644 index 000000000..f875d5508 --- /dev/null +++ b/lib/classpath.c @@ -0,0 +1,125 @@ +/* Java CLASSPATH handling. + Copyright (C) 2001-2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + This program 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) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "classpath.h" + +#include +#include +#include + +#include "xsetenv.h" +#include "xalloc.h" + +/* Name of environment variable. */ +#ifndef CLASSPATHVAR +# define CLASSPATHVAR "CLASSPATH" +#endif + +/* Separator in PATH like lists of pathnames. */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define PATH_SEPARATOR ';' +#else + /* Unix */ +# define PATH_SEPARATOR ':' +#endif + +/* Return the new CLASSPATH value. The given classpaths are prepended to + the current CLASSPATH value. If use_minimal_classpath, the current + CLASSPATH is ignored. */ +char * +new_classpath (const char * const *classpaths, unsigned int classpaths_count, + bool use_minimal_classpath) +{ + const char *old_classpath; + unsigned int length; + unsigned int i; + char *result; + char *p; + + old_classpath = (use_minimal_classpath ? NULL : getenv (CLASSPATHVAR)); + if (old_classpath == NULL) + old_classpath = ""; + + length = 0; + for (i = 0; i < classpaths_count; i++) + length += strlen (classpaths[i]) + 1; + length += strlen (old_classpath); + if (classpaths_count > 0 && old_classpath[0] == '\0') + length--; + + result = (char *) xmalloc (length + 1); + p = result; + for (i = 0; i < classpaths_count; i++) + { + memcpy (p, classpaths[i], strlen (classpaths[i])); + p += strlen (classpaths[i]); + *p++ = PATH_SEPARATOR; + } + if (old_classpath[0] != '\0') + { + memcpy (p, old_classpath, strlen (old_classpath)); + p += strlen (old_classpath); + } + else + { + if (classpaths_count > 0) + p--; + } + *p = '\0'; + + return result; +} + +/* Set CLASSPATH and returns a safe copy of its old value. */ +char * +set_classpath (const char * const *classpaths, unsigned int classpaths_count, + bool use_minimal_classpath, bool verbose) +{ + const char *old_CLASSPATH = getenv (CLASSPATHVAR); + char *result = (old_CLASSPATH != NULL ? xstrdup (old_CLASSPATH) : NULL); + char *new_CLASSPATH = + new_classpath (classpaths, classpaths_count, use_minimal_classpath); + + if (verbose) + printf (CLASSPATHVAR "=%s ", new_CLASSPATH); + + xsetenv (CLASSPATHVAR, new_CLASSPATH, 1); + + free (new_CLASSPATH); + + return result; +} + +/* Restore CLASSPATH to its previous value. */ +void +reset_classpath (char *old_classpath) +{ + if (old_classpath != NULL) + { + xsetenv (CLASSPATHVAR, old_classpath, 1); + free (old_classpath); + } + else + unsetenv (CLASSPATHVAR); +} diff --git a/lib/classpath.h b/lib/classpath.h new file mode 100644 index 000000000..cce847f10 --- /dev/null +++ b/lib/classpath.h @@ -0,0 +1,34 @@ +/* Java CLASSPATH handling. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program 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) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include + +/* Return the new CLASSPATH value. The given classpaths are prepended to + the current CLASSPATH value. If use_minimal_classpath, the current + CLASSPATH is ignored. */ +extern char * new_classpath (const char * const *classpaths, + unsigned int classpaths_count, + bool use_minimal_classpath); + +/* Set CLASSPATH and returns a safe copy of its old value. */ +extern char * set_classpath (const char * const *classpaths, + unsigned int classpaths_count, + bool use_minimal_classpath, bool verbose); + +/* Restore CLASSPATH to its previous value. */ +extern void reset_classpath (char *old_classpath); diff --git a/modules/classpath b/modules/classpath new file mode 100644 index 000000000..c6b893771 --- /dev/null +++ b/modules/classpath @@ -0,0 +1,26 @@ +Description: +Java CLASSPATH handling. + +Files: +lib/classpath.h +lib/classpath.c + +Depends-on: +stdbool +xsetenv +xalloc + +configure.ac: + +Makefile.am: +lib_SOURCES += classpath.h classpath.c + +Include: +"classpath.h" + +License: +GPL + +Maintainer: +Bruno Haible + -- 2.11.0