X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fjavaversion.c;h=7d76539d177943a585eeb2aeed32897f2a3140fb;hb=969fe755730d23ba7ff21ae7511f66067d0a94d8;hp=a0dea953e1807d436dca6e766b7950e998a52381;hpb=86170f0617fd4da0fd85c6c8918a0a27aeec0f94;p=gnulib.git

diff --git a/lib/javaversion.c b/lib/javaversion.c
index a0dea953e..7d76539d1 100644
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -1,11 +1,11 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   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,12 +13,9 @@
    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>
 
 /* Specification.  */
 #include "javaversion.h"
@@ -37,11 +34,13 @@
 #include "pipe.h"
 #include "wait-process.h"
 #include "error.h"
-#include "getline.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
 
+/* Get PKGDATADIR.  */
+#include "configmake.h"
+
 
 struct locals
 {
@@ -51,8 +50,8 @@ struct locals
 
 static bool
 execute_and_read_line (const char *progname,
-		       const char *prog_path, char **prog_argv,
-		       void *private_data)
+                       const char *prog_path, char **prog_argv,
+                       void *private_data)
 {
   struct locals *l = (struct locals *) private_data;
   pid_t child;
@@ -65,7 +64,7 @@ execute_and_read_line (const char *progname,
 
   /* Open a pipe to the JVM.  */
   child = create_pipe_in (progname, prog_path, prog_argv, DEV_NULL, false,
-			  true, false, fd);
+                          true, false, fd);
 
   if (child == -1)
     return false;
@@ -91,7 +90,8 @@ execute_and_read_line (const char *progname,
   fclose (fp);
 
   /* Remove zombie process from process list, and retrieve exit status.  */
-  exitstatus = wait_subprocess (child, progname, true, false, true, false);
+  exitstatus =
+    wait_subprocess (child, progname, true, false, true, false, NULL);
   if (exitstatus != 0)
     {
       free (line);
@@ -113,7 +113,7 @@ javaexec_version (void)
   args[0] = NULL;
   locals.line = NULL;
   execute_java_class (class_name, &pkgdatadir, 1, true, NULL, args,
-		      false, false, execute_and_read_line, &locals);
+                      false, false, execute_and_read_line, &locals);
 
   return locals.line;
 }