X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcsharpcomp.c;h=1e84f056155daadb07202b6a72bfb6d41a850529;hb=56093e4d947bcc87bbc05ac3e8645509274f57b4;hp=16646dc4638460d2506c61e72b509bc02b8d7ded;hpb=d68417c03e69fde605af699ba9a9671c663d8baf;p=gnulib.git

diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index 16646dc46..1e84f0561 100644
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.c
@@ -1,11 +1,11 @@
 /* Compile a C# program.
-   Copyright (C) 2003-2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 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,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>
@@ -84,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;
     }
@@ -152,7 +151,7 @@ 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])
@@ -182,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;
     }
 
@@ -301,7 +332,8 @@ 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)
@@ -377,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;
 	}
@@ -455,7 +487,7 @@ 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++)
 	freea (argv[i]);