Merge branch 't/stdin_stdout_fixes'

Was cooking for almost a month.

	b99b4a stdin/stdout: Restore fd flags on shutdown.

Conflicts:
	stdin.c
	stdout.c

diff --cc NEWS
index a93fb2e3315839de57daef32cf5166cd3852579c,f323df1dda766dadfdc7fe559e6a39fa42824d58..07481964e2400d42caeb0db78bf3d66bbbe44509
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,12 -2,6 +2,14 @@@
  0.?.? (to be announced) "spectral gravity"
  ------------------------------------------
  
 +      - UTF8 support for para_gui and the mp3 audio format handler.
 +      - Scheduler improvements and fixes.
 +      - The obsolete gettimeofday() function has been replaced
 +        by clock_gettime() on systems which support it.
 +      - Speed and usability improvements for para_gui.
++      - para_client now restores the fd flags of stdin and stdout
++        on shutdown
 +
  -----------------------------------------
  0.4.12 (2012-12-20) "volatile relativity"
  -----------------------------------------

diff --cc stdin.c
index b25a0ba013fb03b19cb757d07ff483c9389a0d70,08bc1f9a4be9c2964ae1c882cf6e34cd11685a19..20b9250e9b7fbf3c252e20dff8891bfeeb5112dd
--- 1/stdin.c
--- 2/stdin.c
+++ b/stdin.c
@@@ -65,10 -67,16 +65,16 @@@ static int stdin_post_select(struct sch
        if (ret < 0)
                goto err;
        if (ret == 0)
 -              return;
 +              return 0;
        sz = btr_pool_get_buffer(sit->btrp, &buf);
        if (sz == 0)
 -              return;
 +              return 0;
+       if (sit->must_set_nonblock_flag) {
+               ret = mark_fd_nonblocking(STDIN_FILENO);
+               if (ret < 0)
+                       goto err;
+               sit->must_set_nonblock_flag = false;
+       }
        /*
         * Do not use the maximal size to avoid having only a single buffer
         * reference for the whole pool. This is bad because if that single
@@@ -79,11 -87,13 +85,13 @@@
        if (n > 0)
                btr_add_output_pool(sit->btrp, n, sit->btrn);
        if (ret >= 0)
 -              return;
 +              return 0;
  err:
        btr_remove_node(&sit->btrn);
+       /* Revert to blocking mode if necessary. */
+       fcntl(STDIN_FILENO, F_SETFL, sit->fd_flags);
        //btr_pool_free(sit->btrp);
 -      t->error = ret;
 +      return ret;
  }
  
  /**

diff --cc stdout.c
index abf3d06f17a64249671ffbfb0470aa995a599578,0cf4876db49125efe83e733e6c5f5c7ee921aa45..cf33bf6d0b67cf49625d27b4d602dec35922d32d
--- 1/stdout.c
--- 2/stdout.c
+++ b/stdout.c
@@@ -58,10 -60,16 +58,16 @@@ static int stdout_post_select(struct sc
        if (ret < 0)
                goto out;
        if (ret == 0)
 -              return;
 +              return 0;
        if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
 -              return;
 +              return 0;
  
+       if (sot->must_set_nonblock_flag) {
+               ret = mark_fd_nonblocking(STDOUT_FILENO);
+               if (ret < 0)
+                       goto out;
+               sot->must_set_nonblock_flag = false;
+       }
        for (;;) {
                sz = btr_next_buffer(btrn, &buf);
                if (sz == 0)
@@@ -72,9 -80,12 +78,12 @@@
                btr_consume(btrn, ret);
        }
  out:
-       if (ret < 0)
+       if (ret < 0) {
                btr_remove_node(&sot->btrn);
 -      t->error = ret;
+               /* Revert to blocking mode if necessary. */
+               fcntl(STDOUT_FILENO, F_SETFL, sot->fd_flags);
+       }
 +      return ret;
  }
  /**
   * Initialize a stdout task structure with default values.