X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclasspath.c;h=7913e51b5deea0bd97ed5bdfa844cd9720a60a90;hb=5a4965c01c8b2aca03846238596c0b9f0ed3ce85;hp=4809fc629c0d9802bc6b08a80d6584074cef14af;hpb=7c6d5072278ec9af612e21f0507a009ed37816e1;p=gnulib.git diff --git a/lib/classpath.c b/lib/classpath.c index 4809fc629..7913e51b5 100644 --- a/lib/classpath.c +++ b/lib/classpath.c @@ -1,11 +1,11 @@ /* Java CLASSPATH handling. - Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2009-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2001. - This program is free software; you can redistribute it and/or modify + 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. + the Free Software Foundation; either version 3 of the License, 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 @@ -13,8 +13,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -47,7 +46,7 @@ CLASSPATH is ignored. */ char * new_classpath (const char * const *classpaths, unsigned int classpaths_count, - bool use_minimal_classpath) + bool use_minimal_classpath) { const char *old_classpath; unsigned int length; @@ -82,7 +81,7 @@ new_classpath (const char * const *classpaths, unsigned int classpaths_count, else { if (classpaths_count > 0) - p--; + p--; } *p = '\0'; @@ -92,7 +91,7 @@ new_classpath (const char * const *classpaths, unsigned int classpaths_count, /* 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) + bool use_minimal_classpath, bool verbose) { const char *old_CLASSPATH = getenv (CLASSPATHVAR); char *result = (old_CLASSPATH != NULL ? xstrdup (old_CLASSPATH) : NULL);