Cosmetics: Rename samplerate to sample_rate.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index fa1538b0d63f3db2ca8be6497aa0ce797d3a89a1..865ed658afc4197f4ba29ce5344be38fcbd48bad 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -294,9 +294,9 @@ static int align_str(WINDOW* win, char *str, unsigned int len,
                str[len] = '\0';
                num = 0;
        }
-       /* replace newlines by spaces */
+       /* replace control characters by spaces */
        for (i = 0; i < len && str[i]; i++) {
-               if (str[i] == '\n')
+               if (str[i] == '\n' || str[i] == '\r' || str[i] == '\f')
                        str[i] = ' ';
        }
        if (align == LEFT) {
@@ -902,7 +902,13 @@ static int open_stat_pipe(void)
        if (init)
                init = 0;
        else
-               sleep(1);
+               /*
+                * Sleep a bit to avoid a busy loop. As the call to sleep() may
+                * be interrupted by SIGCHLD, we simply wait until the call
+                * succeeds.
+                */
+               while (sleep(2))
+                       ; /* nothing */
        ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
        if (ret < 0)
                return ret;