projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Needs to depend on modules 'errno' and 'time'.
[gnulib.git]
/
lib
/
csharpexec.c
diff --git
a/lib/csharpexec.c
b/lib/csharpexec.c
index
6c25ecd
..
c1fc27a
100644
(file)
--- a/
lib/csharpexec.c
+++ b/
lib/csharpexec.c
@@
-1,11
+1,11
@@
/* Execute a C# program.
/* Execute a C# program.
- Copyright (C) 2003-200
5
Free Software Foundation, Inc.
+ Copyright (C) 2003-200
8
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
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
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
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
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. */
#include <alloca.h>
/* Specification. */
@@
-29,7
+26,7
@@
#include "execute.h"
#include "sh-quote.h"
#include "execute.h"
#include "sh-quote.h"
-#include "x
allocs
a.h"
+#include "x
malloc
a.h"
#include "error.h"
#include "gettext.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,
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;
}
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;
bool err;
argc = 1 + 2 * libdirs_count + 1 + nargs;
- argv = (char **) x
allocs
a ((argc + 1) * sizeof (char *));
+ argv = (char **) x
malloc
a ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "ilrun";
argp = argv;
*argp++ = "ilrun";
@@
-152,7
+149,7
@@
execute_csharp_using_pnet (const char *assembly_path,
err = executer ("ilrun", "ilrun", argv, private_data);
err = executer ("ilrun", "ilrun", argv, private_data);
- free
s
a (argv);
+ freea (argv);
return err;
}
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,
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;
}
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;
if (mono_present)
{
char *old_monopath;
- char **argv = (char **) x
allocs
a ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) x
malloc
a ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
bool err;
unsigned int i;
bool err;
@@
-214,7
+211,7
@@
execute_csharp_using_mono (const char *assembly_path,
/* Reset MONO_PATH. */
reset_monopath (old_monopath);
/* Reset MONO_PATH. */
reset_monopath (old_monopath);
- free
s
a (argv);
+ freea (argv);
return err;
}
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,
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;
}
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;
if (clix_present)
{
char *old_clixpath;
- char **argv = (char **) x
allocs
a ((2 + nargs + 1) * sizeof (char *));
+ char **argv = (char **) x
malloc
a ((2 + nargs + 1) * sizeof (char *));
unsigned int i;
bool err;
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);
/* Reset clix' PATH variable. */
reset_clixpath (old_clixpath);
- free
s
a (argv);
+ freea (argv);
return err;
}
return err;
}