/* Execute a Java program.
- Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2006-2008 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
+ 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
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>
#include <alloca.h>
/* Specification. */
#include "classpath.h"
#include "xsetenv.h"
#include "sh-quote.h"
-#include "pathname.h"
+#include "concat-filename.h"
#include "xalloc.h"
-#include "xallocsa.h"
+#include "xmalloca.h"
#include "error.h"
#include "gettext.h"
/* First, try a class compiled to a native code executable. */
if (exe_dir != NULL)
{
- char *exe_pathname = concatenated_pathname (exe_dir, class_name, EXEEXT);
+ char *exe_pathname = xconcatenated_filename (exe_dir, class_name, EXEEXT);
char *old_classpath;
- char **argv = (char **) xallocsa ((1 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xmalloca ((1 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
- freesa (argv);
+ freea (argv);
goto done1;
}
command_length += 1 + shell_quote_length (*arg);
command_length += 1;
- command = (char *) xallocsa (command_length);
+ command = (char *) xmalloca (command_length);
p = command;
/* Don't shell_quote $JAVA, because it may consist of a command
and options. */
argv[3] = NULL;
err = executer (java, "/bin/sh", argv, private_data);
- freesa (command);
+ freea (command);
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
argv[1] = "--version";
argv[2] = NULL;
exitstatus = execute ("gij", "gij", argv, false, false, true, true,
- true, false);
+ true, false, NULL);
gij_present = (exitstatus == 0);
gij_tested = true;
}
if (gij_present)
{
char *old_classpath;
- char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
- freesa (argv);
+ freea (argv);
goto done2;
}
argv[1] = "-version";
argv[2] = NULL;
exitstatus = execute ("java", "java", argv, false, false, true, true,
- true, false);
+ true, false, NULL);
java_present = (exitstatus == 0);
java_tested = true;
}
if (java_present)
{
char *old_classpath;
- char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. We don't use the "-classpath ..." option because
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
- freesa (argv);
+ freea (argv);
goto done2;
}
argv[0] = "jre";
argv[1] = NULL;
exitstatus = execute ("jre", "jre", argv, false, false, true, true,
- true, false);
+ true, false, NULL);
jre_present = (exitstatus == 0 || exitstatus == 1);
jre_tested = true;
}
if (jre_present)
{
char *old_classpath;
- char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. We don't use the "-classpath ..." option because
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
- freesa (argv);
+ freea (argv);
goto done2;
}
argv[1] = "-?";
argv[2] = NULL;
exitstatus = execute ("jview", "jview", argv, false, false, true, true,
- true, false);
+ true, false, NULL);
jview_present = (exitstatus == 0 || exitstatus == 1);
jview_tested = true;
}
if (jview_present)
{
char *old_classpath;
- char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
/* Set CLASSPATH. */
/* Reset CLASSPATH. */
reset_classpath (old_classpath);
- freesa (argv);
+ freea (argv);
goto done2;
}