* 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"
#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;
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);
timeout.tv_usec = 1000 * 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);
+ ret = para_select(max + 1, &rfds, &wfds, &timeout);
if (ret < 0) {
- if (errno == EINTR || errno == EAGAIN)
- goto recv;
ret = -E_RECV_SELECT;
goto out;
}
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;
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;
}