X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcsharpcomp.c;h=1e84f056155daadb07202b6a72bfb6d41a850529;hb=78f5fbf491b6f12a67a633f919ec24f97570a733;hp=cbc6520fbb96dc3f42ee25b48c1f663903904821;hpb=b7b797042fa5f79590c77cad90fb073dccd960b2;p=gnulib.git diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c index cbc6520fb..1e84f0561 100644 --- a/lib/csharpcomp.c +++ b/lib/csharpcomp.c @@ -1,11 +1,11 @@ /* Compile a C# program. - Copyright (C) 2003-2006 Free Software Foundation, Inc. + Copyright (C) 2003-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. - 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 . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include /* Specification. */ @@ -32,10 +29,9 @@ #include "execute.h" #include "pipe.h" #include "wait-process.h" -#include "getline.h" #include "sh-quote.h" #include "safe-read.h" -#include "xallocsa.h" +#include "xmalloca.h" #include "error.h" #include "gettext.h" @@ -87,7 +83,7 @@ compile_csharp_using_pnet (const char * const *sources, argv[1] = "--version"; argv[2] = NULL; exitstatus = execute ("cscc", "cscc", argv, false, false, true, true, - true, false); + true, false, NULL); cscc_present = (exitstatus == 0); cscc_tested = true; } @@ -104,7 +100,7 @@ compile_csharp_using_pnet (const char * const *sources, 1 + (output_is_library ? 1 : 0) + 2 + 2 * libdirs_count + 2 * libraries_count + (optimize ? 1 : 0) + (debug ? 1 : 0) + sources_count; - argv = (char **) xallocsa ((argc + 1) * sizeof (char *)); + argv = (char **) xmalloca ((argc + 1) * sizeof (char *)); argp = argv; *argp++ = "cscc"; @@ -133,7 +129,7 @@ compile_csharp_using_pnet (const char * const *sources, && memcmp (source_file + strlen (source_file) - 10, ".resources", 10) == 0) { - char *option = (char *) xallocsa (12 + strlen (source_file) + 1); + char *option = (char *) xmalloca (12 + strlen (source_file) + 1); memcpy (option, "-fresources=", 12); strcpy (option + 12, source_file); @@ -155,12 +151,12 @@ compile_csharp_using_pnet (const char * const *sources, } exitstatus = execute ("cscc", "cscc", argv, false, false, false, false, - true, true); + true, true, NULL); for (i = 0; i < sources_count; i++) if (argv[argc - sources_count + i] != sources[i]) - freesa (argv[argc - sources_count + i]); - freesa (argv); + freea (argv[argc - sources_count + i]); + freea (argv); return (exitstatus != 0); } @@ -185,16 +181,48 @@ compile_csharp_using_mono (const char * const *sources, if (!mcs_tested) { /* Test for presence of mcs: - "mcs --version >/dev/null 2>/dev/null" */ + "mcs --version >/dev/null 2>/dev/null" + and (to exclude an unrelated 'mcs' program on QNX 6) + "mcs --version 2>/dev/null | grep Mono >/dev/null" */ char *argv[3]; + pid_t child; + int fd[1]; int exitstatus; argv[0] = "mcs"; argv[1] = "--version"; argv[2] = NULL; - exitstatus = execute ("mcs", "mcs", argv, false, false, true, true, true, - false); - mcs_present = (exitstatus == 0); + child = create_pipe_in ("mcs", "mcs", argv, DEV_NULL, true, true, false, + fd); + mcs_present = false; + if (child != -1) + { + /* Read the subprocess output, and test whether it contains the + string "Mono". */ + char c[4]; + size_t count = 0; + + while (safe_read (fd[0], &c[count], 1) > 0) + { + count++; + if (count == 4) + { + if (memcmp (c, "Mono", 4) == 0) + mcs_present = true; + c[0] = c[1]; c[1] = c[2]; c[2] = c[3]; + count--; + } + } + + close (fd[0]); + + /* Remove zombie process from process list, and retrieve exit + status. */ + exitstatus = + wait_subprocess (child, "mcs", false, true, true, false, NULL); + if (exitstatus != 0) + mcs_present = false; + } mcs_tested = true; } @@ -216,28 +244,28 @@ compile_csharp_using_mono (const char * const *sources, argc = 1 + (output_is_library ? 1 : 0) + 1 + libdirs_count + libraries_count + (debug ? 1 : 0) + sources_count; - argv = (char **) xallocsa ((argc + 1) * sizeof (char *)); + argv = (char **) xmalloca ((argc + 1) * sizeof (char *)); argp = argv; *argp++ = "mcs"; if (output_is_library) *argp++ = "-target:library"; { - char *option = (char *) xallocsa (5 + strlen (output_file) + 1); + char *option = (char *) xmalloca (5 + strlen (output_file) + 1); memcpy (option, "-out:", 5); strcpy (option + 5, output_file); *argp++ = option; } for (i = 0; i < libdirs_count; i++) { - char *option = (char *) xallocsa (5 + strlen (libdirs[i]) + 1); + char *option = (char *) xmalloca (5 + strlen (libdirs[i]) + 1); memcpy (option, "-lib:", 5); strcpy (option + 5, libdirs[i]); *argp++ = option; } for (i = 0; i < libraries_count; i++) { - char *option = (char *) xallocsa (11 + strlen (libraries[i]) + 4 + 1); + char *option = (char *) xmalloca (11 + strlen (libraries[i]) + 4 + 1); memcpy (option, "-reference:", 11); memcpy (option + 11, libraries[i], strlen (libraries[i])); strcpy (option + 11 + strlen (libraries[i]), ".dll"); @@ -252,7 +280,7 @@ compile_csharp_using_mono (const char * const *sources, && memcmp (source_file + strlen (source_file) - 10, ".resources", 10) == 0) { - char *option = (char *) xallocsa (10 + strlen (source_file) + 1); + char *option = (char *) xmalloca (10 + strlen (source_file) + 1); memcpy (option, "-resource:", 10); strcpy (option + 10, source_file); @@ -304,17 +332,18 @@ compile_csharp_using_mono (const char * const *sources, fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, "mcs", false, false, true, true); + exitstatus = + wait_subprocess (child, "mcs", false, false, true, true, NULL); for (i = 1 + (output_is_library ? 1 : 0); i < 1 + (output_is_library ? 1 : 0) + 1 + libdirs_count + libraries_count; i++) - freesa (argv[i]); + freea (argv[i]); for (i = 0; i < sources_count; i++) if (argv[argc - sources_count + i] != sources[i]) - freesa (argv[argc - sources_count + i]); - freesa (argv); + freea (argv[argc - sources_count + i]); + freea (argv); return (exitstatus != 0); } @@ -380,7 +409,7 @@ compile_csharp_using_sscli (const char * const *sources, /* Remove zombie process from process list, and retrieve exit status. */ exitstatus = - wait_subprocess (child, "csc", false, true, true, false); + wait_subprocess (child, "csc", false, true, true, false, NULL); if (exitstatus != 0) csc_present = false; } @@ -398,27 +427,28 @@ compile_csharp_using_sscli (const char * const *sources, argc = 1 + 1 + 1 + libdirs_count + libraries_count + (optimize ? 1 : 0) + (debug ? 1 : 0) + sources_count; - argv = (char **) xallocsa ((argc + 1) * sizeof (char *)); + argv = (char **) xmalloca ((argc + 1) * sizeof (char *)); argp = argv; *argp++ = "csc"; - *argp++ = (output_is_library ? "-target:library" : "-target:exe"); + *argp++ = + (char *) (output_is_library ? "-target:library" : "-target:exe"); { - char *option = (char *) xallocsa (5 + strlen (output_file) + 1); + char *option = (char *) xmalloca (5 + strlen (output_file) + 1); memcpy (option, "-out:", 5); strcpy (option + 5, output_file); *argp++ = option; } for (i = 0; i < libdirs_count; i++) { - char *option = (char *) xallocsa (5 + strlen (libdirs[i]) + 1); + char *option = (char *) xmalloca (5 + strlen (libdirs[i]) + 1); memcpy (option, "-lib:", 5); strcpy (option + 5, libdirs[i]); *argp++ = option; } for (i = 0; i < libraries_count; i++) { - char *option = (char *) xallocsa (11 + strlen (libraries[i]) + 4 + 1); + char *option = (char *) xmalloca (11 + strlen (libraries[i]) + 4 + 1); memcpy (option, "-reference:", 11); memcpy (option + 11, libraries[i], strlen (libraries[i])); strcpy (option + 11 + strlen (libraries[i]), ".dll"); @@ -435,7 +465,7 @@ compile_csharp_using_sscli (const char * const *sources, && memcmp (source_file + strlen (source_file) - 10, ".resources", 10) == 0) { - char *option = (char *) xallocsa (10 + strlen (source_file) + 1); + char *option = (char *) xmalloca (10 + strlen (source_file) + 1); memcpy (option, "-resource:", 10); strcpy (option + 10, source_file); @@ -457,14 +487,14 @@ compile_csharp_using_sscli (const char * const *sources, } exitstatus = execute ("csc", "csc", argv, false, false, false, false, - true, true); + true, true, NULL); for (i = 2; i < 3 + libdirs_count + libraries_count; i++) - freesa (argv[i]); + freea (argv[i]); for (i = 0; i < sources_count; i++) if (argv[argc - sources_count + i] != sources[i]) - freesa (argv[argc - sources_count + i]); - freesa (argv); + freea (argv[argc - sources_count + i]); + freea (argv); return (exitstatus != 0); }