X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fjavacomp.c;h=7d0a94273e643b82184a0b6c507d9b084e98e5c9;hb=4cd8485e904c1a98470eb548fe6ac0f04e343c4e;hp=a05267a376aa2f5df704e773254d566de5f7b1cf;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/javacomp.c b/lib/javacomp.c index a05267a37..7d0a94273 100644 --- a/lib/javacomp.c +++ b/lib/javacomp.c @@ -1,5 +1,5 @@ /* Compile 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 , 2001. This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ #include "safe-read.h" #include "xalloc.h" #include "xmalloca.h" -#include "filename.h" +#include "concat-filename.h" #include "fwriteerror.h" #include "clean-temp.h" #include "error.h" @@ -268,7 +268,7 @@ compile_using_envjavac (const char *javac, argv[2] = command; argv[3] = NULL; exitstatus = execute (javac, "/bin/sh", argv, false, false, false, - null_stderr, true, true); + null_stderr, true, true, NULL); err = (exitstatus != 0); freea (command); @@ -350,7 +350,7 @@ compile_using_gcj (const char * const *java_sources, } exitstatus = execute ("gcj", "gcj", argv, false, false, false, null_stderr, - true, true); + true, true, NULL); err = (exitstatus != 0); if (ftarget_arg != NULL) @@ -421,7 +421,7 @@ compile_using_javac (const char * const *java_sources, } exitstatus = execute ("javac", "javac", argv, false, false, false, - null_stderr, true, true); + null_stderr, true, true, NULL); err = (exitstatus != 0); freea (argv); @@ -476,7 +476,7 @@ compile_using_jikes (const char * const *java_sources, } exitstatus = execute ("jikes", "jikes", argv, false, false, false, - null_stderr, true, true); + null_stderr, true, true, NULL); err = (exitstatus != 0); freea (argv); @@ -605,7 +605,8 @@ is_envjavac_gcj (const char *javac) fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, javac, true, true, true, false); + exitstatus = + wait_subprocess (child, javac, true, true, true, false, NULL); if (exitstatus != 0) envjavac_gcj = false; @@ -689,7 +690,8 @@ is_envjavac_gcj43 (const char *javac) fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, javac, true, true, true, false); + exitstatus = + wait_subprocess (child, javac, true, true, true, false, NULL); if (exitstatus != 0) envjavac_gcj43 = false; @@ -739,7 +741,7 @@ is_envjavac_gcj43_usable (const char *javac, return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet (source_version))) { @@ -749,7 +751,7 @@ is_envjavac_gcj43_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -783,9 +785,9 @@ is_envjavac_gcj43_usable (const char *javac, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { free (conftest_file_name); @@ -795,9 +797,9 @@ is_envjavac_gcj43_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -888,7 +890,7 @@ is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep) return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet ("1.4"))) { @@ -898,7 +900,7 @@ is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep) } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -949,7 +951,7 @@ is_envjavac_oldgcj_14_13_usable (const char *javac, return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet ("1.3"))) { @@ -959,7 +961,7 @@ is_envjavac_oldgcj_14_13_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -992,8 +994,8 @@ is_envjavac_oldgcj_14_13_usable (const char *javac, if (javac_works && javac_noassert_works) { conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, get_failcode_snippet ("1.3"))) { @@ -1004,8 +1006,8 @@ is_envjavac_oldgcj_14_13_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1089,7 +1091,7 @@ is_envjavac_nongcj_usable (const char *javac, return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet (source_version))) { @@ -1099,7 +1101,7 @@ is_envjavac_nongcj_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1133,9 +1135,9 @@ is_envjavac_nongcj_usable (const char *javac, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { free (conftest_file_name); @@ -1145,9 +1147,9 @@ is_envjavac_nongcj_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1217,9 +1219,9 @@ is_envjavac_nongcj_usable (const char *javac, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { @@ -1231,9 +1233,9 @@ is_envjavac_nongcj_usable (const char *javac, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1367,7 +1369,7 @@ is_gcj_present (void) /* Remove zombie process from process list, and retrieve exit status. */ exitstatus = - wait_subprocess (child, "gcj", false, true, true, false); + wait_subprocess (child, "gcj", false, true, true, false, NULL); if (exitstatus != 0) gcj_present = false; } @@ -1385,8 +1387,8 @@ is_gcj_present (void) char *conftest_file_name; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftestlib.java", - NULL); + 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" @@ -1399,9 +1401,9 @@ is_gcj_present (void) const char *java_sources[1]; compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestlib.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestlib.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1482,7 +1484,7 @@ is_gcj_43 (void) /* Remove zombie process from process list, and retrieve exit status. */ exitstatus = - wait_subprocess (child, "gcj", false, true, true, false); + wait_subprocess (child, "gcj", false, true, true, false, NULL); if (exitstatus != 0) gcj_43 = false; } @@ -1529,7 +1531,7 @@ is_gcj43_usable (const char *source_version, return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet (source_version))) { @@ -1539,7 +1541,7 @@ is_gcj43_usable (const char *source_version, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1569,9 +1571,9 @@ is_gcj43_usable (const char *source_version, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { free (conftest_file_name); @@ -1580,9 +1582,9 @@ is_gcj43_usable (const char *source_version, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1668,7 +1670,7 @@ is_oldgcj_14_14_usable (bool *usablep) return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet ("1.4"))) { @@ -1678,7 +1680,7 @@ is_oldgcj_14_14_usable (bool *usablep) } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1725,7 +1727,7 @@ is_oldgcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p) return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet ("1.3"))) { @@ -1735,7 +1737,7 @@ is_oldgcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p) } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1791,7 +1793,7 @@ is_javac_present (void) argv[0] = "javac"; argv[1] = NULL; exitstatus = execute ("javac", "javac", argv, false, false, true, true, - true, false); + true, false, NULL); javac_present = (exitstatus == 0 || exitstatus == 1 || exitstatus == 2); javac_tested = true; } @@ -1833,7 +1835,7 @@ is_javac_usable (const char *source_version, const char *target_version, return true; conftest_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.java", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.java", NULL); if (write_temp_file (tmpdir, conftest_file_name, get_goodcode_snippet (source_version))) { @@ -1843,7 +1845,7 @@ is_javac_usable (const char *source_version, const char *target_version, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, "conftest.class", NULL); + xconcatenated_filename (tmpdir->dir_name, "conftest.class", NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1876,9 +1878,9 @@ is_javac_usable (const char *source_version, const char *target_version, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { free (conftest_file_name); @@ -1887,9 +1889,9 @@ is_javac_usable (const char *source_version, const char *target_version, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -1957,9 +1959,9 @@ is_javac_usable (const char *source_version, const char *target_version, free (conftest_file_name); conftest_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.java", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.java", + NULL); if (write_temp_file (tmpdir, conftest_file_name, failcode)) { @@ -1969,9 +1971,9 @@ is_javac_usable (const char *source_version, const char *target_version, } compiled_file_name = - concatenated_filename (tmpdir->dir_name, - "conftestfail.class", - NULL); + xconcatenated_filename (tmpdir->dir_name, + "conftestfail.class", + NULL); register_temp_file (tmpdir, compiled_file_name); java_sources[0] = conftest_file_name; @@ -2055,7 +2057,7 @@ is_jikes_present (void) argv[0] = "jikes"; argv[1] = NULL; exitstatus = execute ("jikes", "jikes", argv, false, false, true, true, - true, false); + true, false, NULL); jikes_present = (exitstatus == 0 || exitstatus == 1); jikes_tested = true; }