X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcsharpexec.c;h=c1fc27ab6d8eb701f38089700647954506a9acd3;hb=d4300b64e12f5ed6eb0634a7de21e9479b18bfbe;hp=6c25ecd1ea8a542625a061c125ba18266257980b;hpb=136b57a7fdd137b610932c774d8ff9edbcfab580;p=gnulib.git

diff --git a/lib/csharpexec.c b/lib/csharpexec.c
index 6c25ecd1e..c1fc27ab6 100644
--- a/lib/csharpexec.c
+++ b/lib/csharpexec.c
@@ -1,11 +1,11 @@
 /* Execute a C# program.
-   Copyright (C) 2003-2005 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,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>
 #include <alloca.h>
 
 /* Specification.  */
@@ -29,7 +26,7 @@
 
 #include "execute.h"
 #include "sh-quote.h"
-#include "xallocsa.h"
+#include "xmalloca.h"
 #include "error.h"
 #include "gettext.h"
 
@@ -112,7 +109,7 @@ execute_csharp_using_pnet (const char *assembly_path,
       argv[1] = "--version";
       argv[2] = NULL;
       exitstatus = execute ("ilrun", "ilrun", argv, false, false, true, true,
-			    true, false);
+			    true, false, NULL);
       ilrun_present = (exitstatus == 0);
       ilrun_tested = true;
     }
@@ -126,7 +123,7 @@ execute_csharp_using_pnet (const char *assembly_path,
       bool err;
 
       argc = 1 + 2 * libdirs_count + 1 + nargs;
-      argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
+      argv = (char **) xmalloca ((argc + 1) * sizeof (char *));
 
       argp = argv;
       *argp++ = "ilrun";
@@ -152,7 +149,7 @@ execute_csharp_using_pnet (const char *assembly_path,
 
       err = executer ("ilrun", "ilrun", argv, private_data);
 
-      freesa (argv);
+      freea (argv);
 
       return err;
     }
@@ -182,7 +179,7 @@ execute_csharp_using_mono (const char *assembly_path,
       argv[1] = "--version";
       argv[2] = NULL;
       exitstatus = execute ("mono", "mono", argv, false, false, true, true,
-			    true, false);
+			    true, false, NULL);
       mono_present = (exitstatus == 0);
       mono_tested = true;
     }
@@ -190,7 +187,7 @@ execute_csharp_using_mono (const char *assembly_path,
   if (mono_present)
     {
       char *old_monopath;
-      char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+      char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
       unsigned int i;
       bool err;
 
@@ -214,7 +211,7 @@ execute_csharp_using_mono (const char *assembly_path,
       /* Reset MONO_PATH.  */
       reset_monopath (old_monopath);
 
-      freesa (argv);
+      freea (argv);
 
       return err;
     }
@@ -243,7 +240,7 @@ execute_csharp_using_sscli (const char *assembly_path,
       argv[0] = "clix";
       argv[1] = NULL;
       exitstatus = execute ("clix", "clix", argv, false, false, true, true,
-			    true, false);
+			    true, false, NULL);
       clix_present = (exitstatus == 0 || exitstatus == 1);
       clix_tested = true;
     }
@@ -251,7 +248,7 @@ execute_csharp_using_sscli (const char *assembly_path,
   if (clix_present)
     {
       char *old_clixpath;
-      char **argv = (char **) xallocsa ((2 + nargs + 1) * sizeof (char *));
+      char **argv = (char **) xmalloca ((2 + nargs + 1) * sizeof (char *));
       unsigned int i;
       bool err;
 
@@ -275,7 +272,7 @@ execute_csharp_using_sscli (const char *assembly_path,
       /* Reset clix' PATH variable.  */
       reset_clixpath (old_clixpath);
 
-      freesa (argv);
+      freea (argv);
 
       return err;
     }