git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libfortran/48961 (EXECUTE_COMMAND_LINE(WAIT=.false.) fails on MinGW) 

2011-05-14  Tobias Burnus  <burnus@net-b.de>

        PR fortran/48961
        * intrinsics/execute_command_line.c (set_cmdstat): Don't abort if
        synchronously executing with WAIT=.false.
        (execute_command_line): Fix setting of cmdstat and exitstat.

From-SVN: r173748
This commit is contained in:
Tobias Burnus 2011-05-14 08:35:18 +02:00 committed by Tobias Burnus
parent 2d9d4585c6
commit b4224aec54
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgfortran/ChangeLog
View File

@ -1,3 +1,10 @@
2011-05-14 Tobias Burnus <burnus@net-b.de>
PR fortran/48961
* intrinsics/execute_command_line.c (set_cmdstat): Don't abort if
synchronously executing with WAIT=.false.
(execute_command_line): Fix setting of cmdstat and exitstat.
2011-05-06 Tobias Burnus <burnus@net-b.de> 2011-05-06 Tobias Burnus <burnus@net-b.de>
PR fortran/18918 PR fortran/18918

25
libgfortran/intrinsics/execute_command_line.c
View File

@ -38,9 +38,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif #endif
enum { EXEC_NOERROR = 0, EXEC_SYSTEMFAILED }; enum { EXEC_SYNCHRONOUS = -2, EXEC_NOERROR = 0, EXEC_SYSTEMFAILED,
EXEC_CHILDFAILED };
static const char *cmdmsg_values[] = static const char *cmdmsg_values[] =
{ "", "Execution of child process impossible" }; { "",
"Termination status of the command-language interpreter cannot be obtained",
"Execution of child process impossible" };
@ -49,7 +52,7 @@ set_cmdstat (int *cmdstat, int value)
{ {
if (cmdstat) if (cmdstat)
*cmdstat = value; *cmdstat = value;
else if (value != 0) else if (value > EXEC_NOERROR)
runtime_error ("Could not execute command line"); runtime_error ("Could not execute command line");
} }
@ -74,10 +77,10 @@ execute_command_line (const char *command, bool wait, int *exitstat,
/* Asynchronous execution. */ /* Asynchronous execution. */
pid_t pid; pid_t pid;
set_cmdstat (cmdstat, 0); set_cmdstat (cmdstat, EXEC_NOERROR);
if ((pid = fork()) < 0) if ((pid = fork()) < 0)
set_cmdstat (cmdstat, EXEC_SYSTEMFAILED); set_cmdstat (cmdstat, EXEC_CHILDFAILED);
else if (pid == 0) else if (pid == 0)
{ {
/* Child process. */ /* Child process. */
@ -91,13 +94,15 @@ execute_command_line (const char *command, bool wait, int *exitstat,
/* Synchronous execution. */ /* Synchronous execution. */
int res = system (cmd); int res = system (cmd);
if (!wait) if (res == -1)
set_cmdstat (cmdstat, -2);
else if (res == -1)
set_cmdstat (cmdstat, EXEC_SYSTEMFAILED); set_cmdstat (cmdstat, EXEC_SYSTEMFAILED);
else if (!wait)
set_cmdstat (cmdstat, EXEC_SYNCHRONOUS);
else else
set_cmdstat (cmdstat, EXEC_NOERROR);
if (res != -1)
{ {
set_cmdstat (cmdstat, 0);
#if defined(WEXITSTATUS) && defined(WIFEXITED) #if defined(WEXITSTATUS) && defined(WIFEXITED)
*exitstat = WIFEXITED(res) ? WEXITSTATUS(res) : res; *exitstat = WIFEXITED(res) ? WEXITSTATUS(res) : res;
#else #else
@ -107,7 +112,7 @@ execute_command_line (const char *command, bool wait, int *exitstat,
} }
/* Now copy back to the Fortran string if needed. */ /* Now copy back to the Fortran string if needed. */
if (cmdstat && *cmdstat > 0) if (cmdstat && *cmdstat > EXEC_NOERROR)
{ {
if (cmdmsg) if (cmdmsg)
fstrcpy (cmdmsg, cmdmsg_len, cmdmsg_values[*cmdstat], fstrcpy (cmdmsg, cmdmsg_len, cmdmsg_values[*cmdstat],