X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fjavaexec.c;h=8bcd6defc72decbbcd3538e56c2bb0e3b3e14a8a;hb=671c9011cb6944a63f0d15f60252c31bf0ee8e9b;hp=6ed616c72d1f3d94077d8e7141c8da4826f29959;hpb=90988ede07abd2e58283d5e06b1b69f74b6967d2;p=gnulib.git

diff --git a/lib/javaexec.c b/lib/javaexec.c
index 6ed616c72..8bcd6defc 100644
--- a/lib/javaexec.c
+++ b/lib/javaexec.c
@@ -1,11 +1,11 @@
 /* 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
+   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
@@ -13,8 +13,7 @@
    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/>.  */
 
 #include <config.h>
 #include <alloca.h>
@@ -30,7 +29,7 @@
 #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"
@@ -95,7 +94,7 @@ execute_java_class (const char *class_name,
   /* 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;
@@ -210,7 +209,7 @@ execute_java_class (const char *class_name,
 	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;
       }
@@ -263,7 +262,7 @@ execute_java_class (const char *class_name,
 	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;
       }
@@ -317,7 +316,7 @@ execute_java_class (const char *class_name,
 	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;
       }
@@ -374,7 +373,7 @@ execute_java_class (const char *class_name,
 	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;
       }