X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=af15eb07efb005f8b959e764d74b1bf2a27db60d;hp=c7bca83a9ada429c8f498ba63735d1b1ff0f3581;hb=3c5c2ebfc2d651f2f77d0df89cbb58a2068bcad0;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92

diff --git a/recv.c b/recv.c
index c7bca83a..af15eb07 100644
--- a/recv.c
+++ b/recv.c
@@ -19,13 +19,14 @@
 
 #include "recv.h"
 #include "recv.cmdline.h"
+#include "fd.h"
 #include "error.h"
 
 struct gengetopt_args_info conf;
 
 INIT_RECV_ERRLISTS;
 
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 
@@ -47,7 +48,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);
@@ -80,16 +82,14 @@ recv:
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
 	timeout.tv_sec = 0;
-	timeout.tv_usec = 1000 * 1000;
+	timeout.tv_usec = 999 * 1000;
 	max = -1;
 	ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-	max = MAX(max, ret);
+	max = PARA_MAX(max, ret);
 
-	PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
-	ret = select(max + 1, &rfds, &wfds, NULL, &timeout);
+	PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max);
+	ret = para_select(max + 1, &rfds, &wfds, &timeout);
 	if (ret < 0) {
-		if (errno == EINTR || errno == EAGAIN)
-			goto recv;
 		ret = -E_RECV_SELECT;
 		goto out;
 	}