transfer.c (read_block_direct): Correct condition.

2013-03-11  Tobias Burnus  <burnus@net-b.de>

        * io/transfer.c (read_block_direct): Correct condition.
        * intrinsics/execute_command_line.c (execute_command_line):
        Remove dead code for the HAVE_FORK case.

From-SVN: r196603

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 54ac5738c0147af87cc21f40ae8e358399b8d882..5412835903a1e9f31a601ce1544b8a16ff657019 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-11  Tobias Burnus  <burnus@net-b.de>
+
+       * io/transfer.c (read_block_direct): Correct condition.
+       * intrinsics/execute_command_line.c (execute_command_line):
+       Remove dead code for the HAVE_FORK case.
+
 2013-02-21  Janne Blomqvist  <jb@gcc.gnu.org>
 
        PR libfortran/30162

diff --git a/libgfortran/intrinsics/execute_command_line.c b/libgfortran/intrinsics/execute_command_line.c
index d0f812dcacd5241cada77e71d6deddcac9a522b2..fa6ea9fbc34c8f89373e28325cc01d4d89e93632 100644 (file)
--- a/libgfortran/intrinsics/execute_command_line.c
+++ b/libgfortran/intrinsics/execute_command_line.c
@@ -94,8 +94,10 @@ execute_command_line (const char *command, bool wait, int *exitstat,
 
       if (res == -1)
        set_cmdstat (cmdstat, EXEC_SYSTEMFAILED);
+#ifndef HAVE_FORK
       else if (!wait)
        set_cmdstat (cmdstat, EXEC_SYNCHRONOUS);
+#endif
       else
        set_cmdstat (cmdstat, EXEC_NOERROR);
 

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 515c34f378eda2c1cb35bfe78b42442fd1a9e22e..d97a325a772dcfbb7890902cb255345b5de9e709 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -641,7 +641,7 @@ read_block_direct (st_parameter_dt *dtp, void *buf, size_t nbytes)
 
       have_read_subrecord = sread (dtp->u.p.current_unit->s, 
                                   buf + have_read_record, to_read_subrecord);
-      if (unlikely (have_read_subrecord) < 0)
+      if (unlikely (have_read_subrecord < 0))
        {
          generate_error (&dtp->common, LIBERROR_OS, NULL);
          return;