gui: Only check STDIN for readability if curses is active.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index aaccb06ac77fcd7bded8ffc46c300039227eabe1..13c5c420d35059d80fa25ba4e6c9cb73551f9b06 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -15,7 +15,6 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
-#include "gcc-compat.h"
 #include "para.h"
 
 #include "recv.h"
@@ -48,7 +47,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
                printf("available receivers: ");
                for (i = 0; receivers[i].name; i++)
                        printf("%s%s", i? " " : "", receivers[i].name);
-               printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+               printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+                       "for help on <receivername>.\n");
                exit(EXIT_SUCCESS);
        }
        return check_receiver_arg(conf.receiver_arg, receiver_num);
@@ -105,13 +105,13 @@ recv:
                goto recv;
        }
        ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-       PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
+       PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);
        if (ret < 0) {
                ret = -E_WRITE_STDOUT;
                goto out;
        }
        if (ret != rn.loaded) {
-               PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
+               PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);
                memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
        }
        rn.loaded -= ret;
@@ -123,6 +123,6 @@ out:
        if (r)
                r->shutdown();
        if (ret < 0)
-               PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        return ret;
 }