/* Execute a Java program.
- Copyright (C) 2001-2003, 2006-2007 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
#include "classpath.h"
#include "xsetenv.h"
#include "sh-quote.h"
-#include "filename.h"
+#include "concat-filename.h"
#include "xalloc.h"
#include "xmalloca.h"
#include "error.h"
/* 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 *exe_pathname = xconcatenated_filename (exe_dir, class_name, EXEEXT);
char *old_classpath;
char **argv = (char **) xmalloca ((1 + nargs + 1) * sizeof (char *));
unsigned int i;
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;
}
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;
}
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;
}
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;
}