Index: gcc/fortran/intrinsic.c
===================================================================
--- gcc/fortran/intrinsic.c (revision 147057)
+++ gcc/fortran/intrinsic.c (working copy)
@@ -2553,6 +2553,15 @@
gfc_check_dtime_etime_sub, NULL, gfc_resolve_dtime_sub,
vl, BT_REAL, 4, REQUIRED, tm, BT_REAL, 4, REQUIRED);
+ add_sym_5s ("execute_command_line", GFC_ISYM_EXECUTE_COMMAND_LINE, NO_CLASS,
+ BT_UNKNOWN, 0, GFC_STD_F2008,
+ NULL, NULL, gfc_resolve_execute_command_line,
+ "command", BT_CHARACTER, dc, REQUIRED,
+ "wait", BT_LOGICAL, dl, OPTIONAL,
+ "exitstat", BT_INTEGER, di, OPTIONAL,
+ "cmdstat", BT_INTEGER, di, OPTIONAL,
+ "cmdmsg", BT_CHARACTER, dc, OPTIONAL);
+
add_sym_1s ("fdate", GFC_ISYM_FDATE, NO_CLASS, BT_UNKNOWN, 0, GFC_STD_GNU,
gfc_check_fdate_sub, NULL, gfc_resolve_fdate_sub,
dt, BT_CHARACTER, dc, REQUIRED);
Index: gcc/fortran/intrinsic.h
===================================================================
--- gcc/fortran/intrinsic.h (revision 147057)
+++ gcc/fortran/intrinsic.h (working copy)
@@ -491,6 +491,7 @@
void gfc_resolve_chmod_sub (gfc_code *);
void gfc_resolve_cpu_time (gfc_code *);
void gfc_resolve_ctime_sub (gfc_code *);
+void gfc_resolve_execute_command_line (gfc_code *);
void gfc_resolve_exit (gfc_code *);
void gfc_resolve_fdate_sub (gfc_code *);
void gfc_resolve_flush (gfc_code *);
Index: gcc/fortran/gfortran.h
===================================================================
--- gcc/fortran/gfortran.h (revision 147057)
+++ gcc/fortran/gfortran.h (working copy)
@@ -359,6 +359,7 @@
GFC_ISYM_ERFC,
GFC_ISYM_ERFC_SCALED,
GFC_ISYM_ETIME,
+ GFC_ISYM_EXECUTE_COMMAND_LINE,
GFC_ISYM_EXIT,
GFC_ISYM_EXP,
GFC_ISYM_EXPONENT,
Index: gcc/fortran/iresolve.c
===================================================================
--- gcc/fortran/iresolve.c (revision 147057)
+++ gcc/fortran/iresolve.c (working copy)
@@ -3001,6 +3001,17 @@
}
+/* Resolve the EXECUTE_COMMAND_LINE intrinsic subroutine. */
+void
+gfc_resolve_execute_command_line (gfc_code *c)
+{
+ const char *name;
+ name = gfc_get_string (PREFIX ("execute_command_line_i%d"),
+ gfc_default_integer_kind);
+ c->resolved_sym = gfc_get_intrinsic_sub_symbol (name);
+}
+
+
/* Resolve the EXIT intrinsic subroutine. */
void
Index: libgfortran/intrinsics/execute_command_line.c
===================================================================
--- libgfortran/intrinsics/execute_command_line.c (revision 0)
+++ libgfortran/intrinsics/execute_command_line.c (revision 0)
@@ -0,0 +1,164 @@
+/* Implementation of the EXECUTE_COMMAND_LINE intrinsic.
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ Contributed by François-Xavier Coudert.
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran 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 3, or (at your option) any later
+version.
+
+Libgfortran is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+. */
+
+#include "libgfortran.h"
+#include
+#include
+
+#ifdef HAVE_STDLIB_H
+#include
+#endif
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#include
+#endif
+
+
+enum { EXEC_NOERROR = 0, EXEC_SYSTEMFAILED };
+static const char *cmdmsg_values[] =
+ { "", "Execution of child process impossible" };
+
+static void
+execute_command_line (const char *command, bool wait, int *exitstat,
+ int *cmdstat, char *cmdmsg,
+ gfc_charlen_type command_len,
+ gfc_charlen_type cmdmsg_len)
+{
+ /* Transform the Fortran string to a C string. */
+ char cmd[command_len + 1];
+ memcpy (cmd, command, command_len);
+ cmd[command_len] = '\0';
+
+ /* Flush all I/O units before executing the command. */
+ flush_all_units();
+
+#if defined(HAVE_FORK)
+ if (!wait)
+ {
+ /* Asynchronous execution. */
+ pid_t pid;
+
+ *cmdstat = 0;
+ if ((pid = fork()) < 0)
+ *cmdstat = EXEC_SYSTEMFAILED;
+ else if (pid == 0)
+ {
+ /* Child process. */
+ int res = system (cmd);
+ _exit (WIFEXITED(res) ? WEXITSTATUS(res) : res);
+ }
+ }
+ else
+#endif
+ {
+ /* Synchronous execution. */
+ int res = system (cmd);
+
+ if (!wait)
+ *cmdstat = -2;
+ else if (res == -1)
+ *cmdstat = EXEC_SYSTEMFAILED;
+ else
+ {
+ *cmdstat = 0;
+#if defined(WEXITSTATUS) && defined(WIFEXITED)
+ *exitstat = WIFEXITED(res) ? WEXITSTATUS(res) : res;
+#else
+ *exitstat = res;
+#endif
+ }
+ }
+
+ /* Now copy back to the Fortran string if needed. */
+ if (*cmdstat > 0)
+ {
+ if (cmdmsg)
+ fstrcpy (cmdmsg, cmdmsg_len, cmdmsg_values[*cmdstat],
+ strlen (cmdmsg_values[*cmdstat]));
+ else
+ runtime_error ("Failure in EXECUTE_COMMAND_LINE: %s",
+ cmdmsg_values[*cmdstat]);
+ }
+}
+
+
+extern void
+execute_command_line_i4 (const char *command, GFC_LOGICAL_4 *wait,
+ GFC_INTEGER_4 *exitstat, GFC_INTEGER_4 *cmdstat,
+ char *cmdmsg, gfc_charlen_type command_len,
+ gfc_charlen_type cmdmsg_len);
+export_proto(execute_command_line_i4);
+
+void
+execute_command_line_i4 (const char *command, GFC_LOGICAL_4 *wait,
+ GFC_INTEGER_4 *exitstat, GFC_INTEGER_4 *cmdstat,
+ char *cmdmsg, gfc_charlen_type command_len,
+ gfc_charlen_type cmdmsg_len)
+{
+ bool w = wait ? *wait : true;
+ int estat, estat_initial, cstat;
+
+ if (exitstat)
+ estat_initial = estat = *exitstat;
+
+ execute_command_line (command, w, &estat, &cstat, cmdmsg, command_len,
+ cmdmsg_len);
+
+ if (exitstat && estat != estat_initial)
+ *exitstat = estat;
+ if (cmdstat)
+ *cmdstat = cstat;
+}
+
+
+extern void
+execute_command_line_i8 (const char *command, GFC_LOGICAL_8 *wait,
+ GFC_INTEGER_8 *exitstat, GFC_INTEGER_8 *cmdstat,
+ char *cmdmsg, gfc_charlen_type command_len,
+ gfc_charlen_type cmdmsg_len);
+export_proto(execute_command_line_i8);
+
+void
+execute_command_line_i8 (const char *command, GFC_LOGICAL_8 *wait,
+ GFC_INTEGER_8 *exitstat, GFC_INTEGER_8 *cmdstat,
+ char *cmdmsg, gfc_charlen_type command_len,
+ gfc_charlen_type cmdmsg_len)
+{
+ bool w = wait ? *wait : true;
+ int estat, estat_initial, cstat;
+
+ if (exitstat)
+ estat_initial = estat = *exitstat;
+
+ execute_command_line (command, w, &estat, &cstat, cmdmsg, command_len,
+ cmdmsg_len);
+
+ if (exitstat && estat != estat_initial)
+ *exitstat = estat;
+ if (cmdstat)
+ *cmdstat = cstat;
+}
Index: libgfortran/gfortran.map
===================================================================
--- libgfortran/gfortran.map (revision 147057)
+++ libgfortran/gfortran.map (working copy)
@@ -1069,6 +1069,8 @@
_gfortran_erfc_scaled_r16;
_gfortran_erfc_scaled_r4;
_gfortran_erfc_scaled_r8;
+ _gfortran_execute_command_line_i4;
+ _gfortran_execute_command_line_i8;
_gfortran_pack_char4;
_gfortran_pack_s_char4;
_gfortran_reshape_char4;
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am (revision 147057)
+++ libgfortran/Makefile.am (working copy)
@@ -76,6 +76,7 @@
intrinsics/eoshift2.c \
intrinsics/erfc_scaled.c \
intrinsics/etime.c \
+intrinsics/execute_command_line.c \
intrinsics/exit.c \
intrinsics/fnum.c \
intrinsics/gerror.c \
Index: libgfortran/Makefile.in
===================================================================
--- libgfortran/Makefile.in (revision 147057)
+++ libgfortran/Makefile.in (working copy)
@@ -421,7 +421,8 @@
intrinsics/cshift0.c intrinsics/ctime.c \
intrinsics/date_and_time.c intrinsics/dtime.c intrinsics/env.c \
intrinsics/eoshift0.c intrinsics/eoshift2.c \
- intrinsics/erfc_scaled.c intrinsics/etime.c intrinsics/exit.c \
+ intrinsics/erfc_scaled.c intrinsics/etime.c \
+ intrinsics/execute_command_line.c intrinsics/exit.c \
intrinsics/fnum.c intrinsics/gerror.c intrinsics/getcwd.c \
intrinsics/getlog.c intrinsics/getXid.c intrinsics/hostnm.c \
intrinsics/ierrno.c intrinsics/ishftc.c \
@@ -713,16 +714,17 @@
am__objects_36 = associated.lo abort.lo access.lo args.lo \
c99_functions.lo chdir.lo chmod.lo clock.lo cpu_time.lo \
cshift0.lo ctime.lo date_and_time.lo dtime.lo env.lo \
- eoshift0.lo eoshift2.lo erfc_scaled.lo etime.lo exit.lo \
- fnum.lo gerror.lo getcwd.lo getlog.lo getXid.lo hostnm.lo \
- ierrno.lo ishftc.lo iso_c_generated_procs.lo iso_c_binding.lo \
- kill.lo link.lo malloc.lo mvbits.lo move_alloc.lo \
- pack_generic.lo perror.lo selected_char_kind.lo signal.lo \
- size.lo sleep.lo spread_generic.lo string_intrinsics.lo \
- system.lo rand.lo random.lo rename.lo reshape_generic.lo \
- reshape_packed.lo selected_int_kind.lo selected_real_kind.lo \
- stat.lo symlnk.lo system_clock.lo time.lo transpose_generic.lo \
- umask.lo unlink.lo unpack_generic.lo in_pack_generic.lo \
+ eoshift0.lo eoshift2.lo erfc_scaled.lo etime.lo \
+ execute_command_line.lo exit.lo fnum.lo gerror.lo getcwd.lo \
+ getlog.lo getXid.lo hostnm.lo ierrno.lo ishftc.lo \
+ iso_c_generated_procs.lo iso_c_binding.lo kill.lo link.lo \
+ malloc.lo mvbits.lo move_alloc.lo pack_generic.lo perror.lo \
+ selected_char_kind.lo signal.lo size.lo sleep.lo \
+ spread_generic.lo string_intrinsics.lo system.lo rand.lo \
+ random.lo rename.lo reshape_generic.lo reshape_packed.lo \
+ selected_int_kind.lo selected_real_kind.lo stat.lo symlnk.lo \
+ system_clock.lo time.lo transpose_generic.lo umask.lo \
+ unlink.lo unpack_generic.lo in_pack_generic.lo \
in_unpack_generic.lo
am__objects_37 =
am__objects_38 = _abs_c4.lo _abs_c8.lo _abs_c10.lo _abs_c16.lo \
@@ -1004,6 +1006,7 @@
intrinsics/eoshift2.c \
intrinsics/erfc_scaled.c \
intrinsics/etime.c \
+intrinsics/execute_command_line.c \
intrinsics/exit.c \
intrinsics/fnum.c \
intrinsics/gerror.c \
@@ -1850,6 +1853,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/erfc_scaled.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etime.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execute_command_line.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exit.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponent_r10.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exponent_r16.Plo@am__quote@
@@ -5420,6 +5424,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etime.lo `test -f 'intrinsics/etime.c' || echo '$(srcdir)/'`intrinsics/etime.c
+execute_command_line.lo: intrinsics/execute_command_line.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT execute_command_line.lo -MD -MP -MF "$(DEPDIR)/execute_command_line.Tpo" -c -o execute_command_line.lo `test -f 'intrinsics/execute_command_line.c' || echo '$(srcdir)/'`intrinsics/execute_command_line.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/execute_command_line.Tpo" "$(DEPDIR)/execute_command_line.Plo"; else rm -f "$(DEPDIR)/execute_command_line.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='intrinsics/execute_command_line.c' object='execute_command_line.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o execute_command_line.lo `test -f 'intrinsics/execute_command_line.c' || echo '$(srcdir)/'`intrinsics/execute_command_line.c
+
exit.lo: intrinsics/exit.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exit.lo -MD -MP -MF "$(DEPDIR)/exit.Tpo" -c -o exit.lo `test -f 'intrinsics/exit.c' || echo '$(srcdir)/'`intrinsics/exit.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/exit.Tpo" "$(DEPDIR)/exit.Plo"; else rm -f "$(DEPDIR)/exit.Tpo"; exit 1; fi