projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/userspec.c (parse_with_separator): If a user or group string
[gnulib.git]
/
lib
/
classpath.c
diff --git
a/lib/classpath.c
b/lib/classpath.c
index
f875d55
..
4809fc6
100644
(file)
--- a/
lib/classpath.c
+++ b/
lib/classpath.c
@@
-1,5
+1,5
@@
/* Java CLASSPATH handling.
/* Java CLASSPATH handling.
- Copyright (C) 2001-2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003
, 2006
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
@@
-14,11
+14,9
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "classpath.h"
/* Specification. */
#include "classpath.h"
@@
-36,12
+34,12
@@
#endif
/* Separator in PATH like lists of pathnames. */
#endif
/* Separator in PATH like lists of pathnames. */
-#if
defined _WIN32 || defined __WIN32__
|| defined __EMX__ || defined __DJGPP__
+#if
((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
|| defined __EMX__ || defined __DJGPP__
/* Win32, OS/2, DOS */
# define PATH_SEPARATOR ';'
#else
/* Unix */
/* Win32, OS/2, DOS */
# define PATH_SEPARATOR ';'
#else
/* Unix */
-# define PATH_SEPARATOR ':'
+# define PATH_SEPARATOR ':'
#endif
/* Return the new CLASSPATH value. The given classpaths are prepended to
#endif
/* Return the new CLASSPATH value. The given classpaths are prepended to
@@
-68,7
+66,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++)
{