This splits module 'concat-filename' into 'concat-filename' (LGPL) and
'xconcat-filename' (GPL).
I don't have to worry here about the old function name taking on a different
semantics, because the old function name was removed from module 'filename':
Packages which are not updated and use current gnulib will get an error; then
the package's maintainer will hopefully read the NEWS entry.
2008-09-01 Bruno Haible <[EMAIL PROTECTED]>
Split module 'concat-filename' into 'concat-filename' (LGPL) and
'xconcat-filename' (GPL).
* modules/concat-filename (Depends-on): Add malloc-posix, remove xalloc.
(License): Change to LGPLv2+.
* modules/xconcat-filename: New file.
* lib/concat-filename.h (concatenated_filename): Change specification.
(xconcatenated_filename): New declaration.
* lib/concat-filename.c: Include errno.h, stdlib.h, not xalloc.h.
(concatenated_filename): Use malloc instead of xalloc. Handle out-of-
memory situations.
* lib/xconcat-filename.c: New file.
* NEWS: Mention the change.
* lib/findprog.c: Include concat-filename.h, not filename.h.
(find_in_path): Use xconcatenated_filename instead of
concatenated_filename.
* lib/javacomp.c: Include concat-filename.h, not filename.h.
(is_envjavac_gcj43_usable, is_envjavac_oldgcj_14_14_usable,
is_envjavac_oldgcj_14_13_usable, is_envjavac_nongcj_usable,
is_gcj_present, is_gcj43_usable, is_oldgcj_14_14_usable,
is_oldgcj_14_13_usable, is_javac_usable): Use xconcatenated_filename
instead of concatenated_filename.
* lib/javaexec.c: Include concat-filename.h, not filename.h.
(execute_java_class): Use xconcatenated_filename instead of
concatenated_filename.
* modules/findprog (Depends-on): Add xconcat-filename, remove filename.
* modules/javacomp (Depends-on): Likewise.
* modules/javaexec (Depends-on): Likewise.
============================ modules/xconcat-filename ========================
Description:
Construct a full filename by concatenating a directory name, a relative
filename, and a suffix, with out-of-memory checking.
Files:
lib/concat-filename.h
lib/xconcat-filename.c
Depends-on:
concat-filename
xalloc-die
configure.ac:
Makefile.am:
lib_SOURCES += xconcat-filename.c
Include:
"concat-filename.h"
License:
GPL
Maintainer:
Bruno Haible
============================= lib/xconcat-filename.c ========================
/* Construct a full filename from a directory and a relative filename.
Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
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 3 of the License, or 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, see <http://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <[EMAIL PROTECTED]>. */
#include <config.h>
/* Specification. */
#include "concat-filename.h"
#include "xalloc.h"
/* Concatenate a directory filename, a relative filename and an optional
suffix. The directory may end with the directory separator. The second
argument may not start with the directory separator (it is relative).
Return a freshly allocated filename. */
char *
xconcatenated_filename (const char *directory, const char *filename,
const char *suffix)
{
char *result;
result = concatenated_filename (directory, filename, suffix);
if (result == NULL)
xalloc_die ();
return result;
}
==============================================================================
*** modules/concat-filename.orig 2008-09-02 01:17:53.000000000 +0200
--- modules/concat-filename 2008-09-02 00:50:27.000000000 +0200
***************
*** 8,14 ****
Depends-on:
filename
! xalloc
stpcpy
configure.ac:
--- 8,14 ----
Depends-on:
filename
! malloc-posix
stpcpy
configure.ac:
***************
*** 20,26 ****
"concat-filename.h"
License:
! GPL
Maintainer:
Bruno Haible
--- 20,26 ----
"concat-filename.h"
License:
! LGPLv2+
Maintainer:
Bruno Haible
*** lib/concat-filename.h.orig 2008-09-02 01:17:52.000000000 +0200
--- lib/concat-filename.h 2008-09-02 00:42:45.000000000 +0200
***************
*** 23,32 ****
/* Concatenate a directory filename, a relative filename and an optional
! suffix. Return a freshly allocated filename. */
extern char *concatenated_filename (const char *directory,
const char *filename, const char *suffix);
#ifdef __cplusplus
}
--- 23,38 ----
/* Concatenate a directory filename, a relative filename and an optional
! suffix. Return a freshly allocated filename. Return NULL and set errno
! upon memory allocation failure. */
extern char *concatenated_filename (const char *directory,
const char *filename, const char *suffix);
+ /* Concatenate a directory filename, a relative filename and an optional
+ suffix. Return a freshly allocated filename. */
+ extern char *xconcatenated_filename (const char *directory,
+ const char *filename, const char *suffix);
+
#ifdef __cplusplus
}
*** lib/concat-filename.c.orig 2008-09-02 01:17:52.000000000 +0200
--- lib/concat-filename.c 2008-09-02 00:50:09.000000000 +0200
***************
*** 21,35 ****
/* Specification. */
#include "concat-filename.h"
#include <string.h>
#include "filename.h"
- #include "xalloc.h"
/* Concatenate a directory filename, a relative filename and an optional
suffix. The directory may end with the directory separator. The second
argument may not start with the directory separator (it is relative).
! Return a freshly allocated filename. */
char *
concatenated_filename (const char *directory, const char *filename,
const char *suffix)
--- 21,37 ----
/* Specification. */
#include "concat-filename.h"
+ #include <errno.h>
+ #include <stdlib.h>
#include <string.h>
#include "filename.h"
/* Concatenate a directory filename, a relative filename and an optional
suffix. The directory may end with the directory separator. The second
argument may not start with the directory separator (it is relative).
! Return a freshly allocated filename. Return NULL and set errno
! upon memory allocation failure. */
char *
concatenated_filename (const char *directory, const char *filename,
const char *suffix)
***************
*** 40,49 ****
if (strcmp (directory, ".") == 0)
{
/* No need to prepend the directory. */
! result = XNMALLOC (strlen (filename)
! + (suffix != NULL ? strlen (suffix) : 0)
! + 1,
! char);
p = result;
}
else
--- 42,52 ----
if (strcmp (directory, ".") == 0)
{
/* No need to prepend the directory. */
! result = (char *) malloc (strlen (filename)
! + (suffix != NULL ? strlen (suffix) : 0)
! + 1);
! if (result == NULL)
! return NULL; /* errno is set here */
p = result;
}
else
***************
*** 52,62 ****
int need_slash =
(directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
&& !ISSLASH (directory[directory_len - 1]));
! result = XNMALLOC (directory_len + need_slash
! + strlen (filename)
! + (suffix != NULL ? strlen (suffix) : 0)
! + 1,
! char);
memcpy (result, directory, directory_len);
p = result + directory_len;
if (need_slash)
--- 55,66 ----
int need_slash =
(directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
&& !ISSLASH (directory[directory_len - 1]));
! result = (char *) malloc (directory_len + need_slash
! + strlen (filename)
! + (suffix != NULL ? strlen (suffix) : 0)
! + 1);
! if (result == NULL)
! return NULL; /* errno is set here */
memcpy (result, directory, directory_len);
p = result + directory_len;
if (need_slash)
*** NEWS.orig 2008-09-02 01:17:52.000000000 +0200
--- NEWS 2008-09-02 00:56:38.000000000 +0200
***************
*** 7,15 ****
Date Modules Changes
2008-09-01 filename The module does not define the function
! concatenated_filename any more. To get this
! function, use module 'concat-filename' and the
! include file "concat-filename.h".
2008-08-31 havelib On Solaris, when searching for 64-bit mode
libraries the directory $prefix/lib is now
ignored.
--- 7,16 ----
Date Modules Changes
2008-09-01 filename The module does not define the function
! concatenated_filename any more. To get an
! equivalent function, use function
! xconcatenated_filename from module
! 'xconcat-filename'.
2008-08-31 havelib On Solaris, when searching for 64-bit mode
libraries the directory $prefix/lib is now
ignored.
*** lib/findprog.c.orig 2008-09-02 01:17:52.000000000 +0200
--- lib/findprog.c 2008-09-02 01:08:07.000000000 +0200
***************
*** 1,5 ****
/* Locating a program in PATH.
! Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
Written by Bruno Haible <[EMAIL PROTECTED]>, 2001.
This program is free software: you can redistribute it and/or modify
--- 1,5 ----
/* Locating a program in PATH.
! Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
Written by Bruno Haible <[EMAIL PROTECTED]>, 2001.
This program is free software: you can redistribute it and/or modify
***************
*** 27,33 ****
#include <unistd.h>
#include "xalloc.h"
! #include "filename.h"
const char *
--- 27,33 ----
#include <unistd.h>
#include "xalloc.h"
! #include "concat-filename.h"
const char *
***************
*** 75,81 ****
dir = ".";
/* Concatenate dir and progname. */
! progpathname = concatenated_filename (dir, progname, NULL);
/* On systems which have the eaccess() system call, let's use it.
On other systems, let's hope that this program is not installed
--- 75,81 ----
dir = ".";
/* Concatenate dir and progname. */
! progpathname = xconcatenated_filename (dir, progname, NULL);
/* On systems which have the eaccess() system call, let's use it.
On other systems, let's hope that this program is not installed
***************
*** 88,94 ****
{
free (progpathname);
! /* Add the "./" prefix for real, that concatenated_filename()
optimized away. This avoids a second PATH search when the
caller uses execlp/execvp. */
progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
--- 88,94 ----
{
free (progpathname);
! /* Add the "./" prefix for real, that xconcatenated_filename()
optimized away. This avoids a second PATH search when the
caller uses execlp/execvp. */
progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
*** lib/javacomp.c.orig 2008-09-02 01:17:52.000000000 +0200
--- lib/javacomp.c 2008-09-02 01:08:28.000000000 +0200
***************
*** 41,47 ****
#include "safe-read.h"
#include "xalloc.h"
#include "xmalloca.h"
! #include "filename.h"
#include "fwriteerror.h"
#include "clean-temp.h"
#include "error.h"
--- 41,47 ----
#include "safe-read.h"
#include "xalloc.h"
#include "xmalloca.h"
! #include "concat-filename.h"
#include "fwriteerror.h"
#include "clean-temp.h"
#include "error.h"
***************
*** 741,747 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
--- 741,747 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
***************
*** 751,757 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 751,757 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 785,793 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
--- 785,793 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
***************
*** 797,805 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 797,805 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 890,896 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
--- 890,896 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
***************
*** 900,906 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 900,906 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 951,957 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
--- 951,957 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
***************
*** 961,967 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 961,967 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 994,1001 ****
if (javac_works && javac_noassert_works)
{
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_failcode_snippet ("1.3")))
{
--- 994,1001 ----
if (javac_works && javac_noassert_works)
{
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_failcode_snippet ("1.3")))
{
***************
*** 1006,1013 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1006,1013 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1091,1097 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
--- 1091,1097 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
***************
*** 1101,1107 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1101,1107 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1135,1143 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
--- 1135,1143 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
***************
*** 1147,1155 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1147,1155 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1219,1227 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
failcode))
{
--- 1219,1227 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
failcode))
{
***************
*** 1233,1241 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1233,1241 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1387,1394 ****
char *conftest_file_name;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftestlib.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"public class conftestlib {\n"
" public static void main (String[] args) {\n"
--- 1387,1394 ----
char *conftest_file_name;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftestlib.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"public class conftestlib {\n"
" public static void main (String[] args) {\n"
***************
*** 1401,1409 ****
const char *java_sources[1];
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestlib.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1401,1409 ----
const char *java_sources[1];
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestlib.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1531,1537 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
--- 1531,1537 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
***************
*** 1541,1547 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1541,1547 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1571,1579 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
--- 1571,1579 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
***************
*** 1582,1590 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1582,1590 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1670,1676 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
--- 1670,1676 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
***************
*** 1680,1686 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1680,1686 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1727,1733 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
--- 1727,1733 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
***************
*** 1737,1743 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1737,1743 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1835,1841 ****
return true;
conftest_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
--- 1835,1841 ----
return true;
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
***************
*** 1845,1851 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1845,1851 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1878,1886 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
--- 1878,1886 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
{
free (conftest_file_name);
***************
*** 1889,1897 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1889,1897 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
***************
*** 1959,1967 ****
free (conftest_file_name);
conftest_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
failcode))
{
--- 1959,1967 ----
free (conftest_file_name);
conftest_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.java",
! NULL);
if (write_temp_file (tmpdir, conftest_file_name,
failcode))
{
***************
*** 1971,1979 ****
}
compiled_file_name =
! concatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
--- 1971,1979 ----
}
compiled_file_name =
! xconcatenated_filename (tmpdir->dir_name,
! "conftestfail.class",
! NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
*** lib/javaexec.c.orig 2008-09-02 01:17:52.000000000 +0200
--- lib/javaexec.c 2008-09-02 01:08:16.000000000 +0200
***************
*** 29,35 ****
#include "classpath.h"
#include "xsetenv.h"
#include "sh-quote.h"
! #include "filename.h"
#include "xalloc.h"
#include "xmalloca.h"
#include "error.h"
--- 29,35 ----
#include "classpath.h"
#include "xsetenv.h"
#include "sh-quote.h"
! #include "concat-filename.h"
#include "xalloc.h"
#include "xmalloca.h"
#include "error.h"
***************
*** 94,100 ****
/* First, try a class compiled to a native code executable. */
if (exe_dir != NULL)
{
! char *exe_pathname = concatenated_filename (exe_dir, class_name,
EXEEXT);
char *old_classpath;
char **argv = (char **) xmalloca ((1 + nargs + 1) * sizeof (char *));
unsigned int i;
--- 94,100 ----
/* First, try a class compiled to a native code executable. */
if (exe_dir != NULL)
{
! char *exe_pathname = xconcatenated_filename (exe_dir, class_name,
EXEEXT);
char *old_classpath;
char **argv = (char **) xmalloca ((1 + nargs + 1) * sizeof (char *));
unsigned int i;
*** modules/findprog.orig 2008-09-02 01:17:53.000000000 +0200
--- modules/findprog 2008-09-02 00:58:56.000000000 +0200
***************
*** 10,16 ****
Depends-on:
stdbool
xalloc
! filename
unistd
configure.ac:
--- 10,16 ----
Depends-on:
stdbool
xalloc
! xconcat-filename
unistd
configure.ac:
*** modules/javacomp.orig 2008-09-02 01:17:53.000000000 +0200
--- modules/javacomp 2008-09-02 00:59:02.000000000 +0200
***************
*** 20,26 ****
xalloc
xmalloca
getline
! filename
fwriteerror
clean-temp
error
--- 20,26 ----
xalloc
xmalloca
getline
! xconcat-filename
fwriteerror
clean-temp
error
*** modules/javaexec.orig 2008-09-02 01:17:53.000000000 +0200
--- modules/javaexec 2008-09-02 00:59:06.000000000 +0200
***************
*** 11,17 ****
classpath
xsetenv
sh-quote
! filename
xalloc
xmalloca
error
--- 11,17 ----
classpath
xsetenv
sh-quote
! xconcat-filename
xalloc
xmalloca
error
