projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Improve wording in relocatable-maint.texi.
[gnulib.git]
/
lib
/
classpath.c
diff --git
a/lib/classpath.c
b/lib/classpath.c
index
ccb66de
..
268c279
100644
(file)
--- a/
lib/classpath.c
+++ b/
lib/classpath.c
@@
-1,11
+1,11
@@
/* Java CLASSPATH handling.
/* Java CLASSPATH handling.
- Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2006
, 2009-2013
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
Written by Bruno Haible <haible@clisp.cons.org>, 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,12
+13,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "classpath.h"
/* Specification. */
#include "classpath.h"
@@
-37,7
+34,7
@@
/* Separator in PATH like lists of pathnames. */
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
/* Separator in PATH like lists of pathnames. */
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
- /*
Win32
, OS/2, DOS */
+ /*
Native Windows
, OS/2, DOS */
# define PATH_SEPARATOR ';'
#else
/* Unix */
# define PATH_SEPARATOR ';'
#else
/* Unix */
@@
-49,7
+46,7
@@
CLASSPATH is ignored. */
char *
new_classpath (const char * const *classpaths, unsigned int classpaths_count,
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;
{
const char *old_classpath;
unsigned int length;
@@
-68,7
+65,7
@@
new_classpath (const char * const *classpaths, unsigned int classpaths_count,
if (classpaths_count > 0 && old_classpath[0] == '\0')
length--;
if (classpaths_count > 0 && old_classpath[0] == '\0')
length--;
- result =
(char *) xmalloc (length + 1
);
+ result =
XNMALLOC (length + 1, char
);
p = result;
for (i = 0; i < classpaths_count; i++)
{
p = result;
for (i = 0; i < classpaths_count; i++)
{
@@
-84,7
+81,7
@@
new_classpath (const char * const *classpaths, unsigned int classpaths_count,
else
{
if (classpaths_count > 0)
else
{
if (classpaths_count > 0)
- p--;
+
p--;
}
*p = '\0';
}
*p = '\0';
@@
-94,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,
/* 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);
{
const char *old_CLASSPATH = getenv (CLASSPATHVAR);
char *result = (old_CLASSPATH != NULL ? xstrdup (old_CLASSPATH) : NULL);