build: Replace $extras by per-executable variable.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index a12867d5d24830e0b9b2050aff957a42eff3cbf0..f7b2b30792881e6146a4e2af1d12373f14b8a53f 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <sys/time.h>
 
 #include "para.h"
 #include "list.h"
@@ -38,10 +37,8 @@ struct private_file_write_data {
 __must_check __malloc static char *random_filename(void)
 {
        char *result, *home = para_homedir();
-       struct timeval tv;
 
-       gettimeofday(&tv, NULL);
-       srandom(tv.tv_usec);
+       srandom(clock_get_realtime(NULL)->tv_usec);
        result = make_message("%s/.paraslash/%08lu", home,
                para_random(99999999));
        free(home);
@@ -100,7 +97,7 @@ static void file_write_close(struct writer_node *wn)
        free(pfwd);
 }
 
-static void file_write_post_select(__a_unused struct sched *s,
+static int file_write_post_select(__a_unused struct sched *s,
                struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -121,18 +118,18 @@ static void file_write_post_select(__a_unused struct sched *s,
                goto out;
        }
        if (!FD_ISSET(pfwd->fd, &s->wfds))
-               return;
+               return 0;
        bytes = btr_next_buffer(btrn, &buf);
        assert(bytes > 0);
        //PARA_INFO_LOG("writing %zu\n", bytes);
-       ret = write(pfwd->fd, buf, bytes);
+       ret = xwrite(pfwd->fd, buf, bytes);
        if (ret < 0)
                goto out;
        btr_consume(btrn, ret);
 out:
        if (ret < 0)
                btr_remove_node(&wn->btrn);
-       t->error = ret;
+       return ret;
 }
 
 __malloc static void *file_write_parse_config_or_die(int argc, char **argv)
@@ -160,9 +157,6 @@ void file_write_init(struct writer *w)
        w->parse_config_or_die = file_write_parse_config_or_die;
        w->free_config = file_write_free_config;
        w->close = file_write_close;
-       w->help = (struct ggo_help) {
-               .short_help = file_write_args_info_help,
-               .detailed_help = file_write_args_info_detailed_help
-       };
+       w->help = (struct ggo_help)DEFINE_GGO_HELP(file_write);
        file_write_cmdline_parser_free(&dummy);
 }