NEWS update.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index e6a3229..8cafbb6 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -50,20 +50,12 @@ __must_check __malloc static char *random_filename(void)
        return result;
 }
 
        return result;
 }
 

-static void file_write_open(struct writer_node *wn)
-{
-       struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
-
-       wn->private_data = pfwd;
-       pfwd->fd = -1;
-}
-

 static int prepare_output_file(struct writer_node *wn)
 {
        struct file_write_args_info *conf = wn->conf;
 static int prepare_output_file(struct writer_node *wn)
 {
        struct file_write_args_info *conf = wn->conf;

-       struct private_file_write_data *pfwd = wn->private_data;

        char *filename;
        int ret;
        char *filename;
        int ret;

+       struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));

 
        if (conf->filename_given)
                filename = conf->filename_arg;
 
        if (conf->filename_given)
                filename = conf->filename_arg;


@@ -76,8 +68,11 @@ static int prepare_output_file(struct writer_node *wn)
                goto out;
        pfwd->fd = ret;
        ret = mark_fd_blocking(pfwd->fd);
                goto out;
        pfwd->fd = ret;
        ret = mark_fd_blocking(pfwd->fd);

-       if (ret >= 0)
-               return 1;
+       if (ret < 0)
+               goto out_close;
+       wn->private_data = pfwd;
+       return 1;
+out_close:

        close(pfwd->fd);
 out:
        free(pfwd);
        close(pfwd->fd);
 out:
        free(pfwd);


@@ -92,7 +87,7 @@ static void file_write_pre_select(struct sched *s, struct task *t)
 
        if (ret == 0)
                return;
 
        if (ret == 0)
                return;

-       if (ret < 0 || pfwd->fd < 0)
+       if (ret < 0 || !pfwd)

                return sched_min_delay(s);
        para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
 }
                return sched_min_delay(s);
        para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
 }


@@ -101,8 +96,9 @@ static void file_write_close(struct writer_node *wn)
 {
        struct private_file_write_data *pfwd = wn->private_data;
 
 {
        struct private_file_write_data *pfwd = wn->private_data;
 

-       if (pfwd->fd >= 0)
-               close(pfwd->fd);
+       if (!pfwd)
+               return;
+       close(pfwd->fd);

        free(pfwd);
 }
 
        free(pfwd);
 }
 


@@ -120,10 +116,9 @@ static void file_write_post_select(__a_unused struct sched *s,
        ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
        if (ret <= 0)
                goto out;
        ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
        if (ret <= 0)
                goto out;

-       if (pfwd->fd < 0) {
+       if (!pfwd) {

                ret = prepare_output_file(wn);
                ret = prepare_output_file(wn);

-               if (ret < 0)
-                       goto out;
+               goto out;

        }
        if (!FD_ISSET(pfwd->fd, &s->wfds))
                return;
        }
        if (!FD_ISSET(pfwd->fd, &s->wfds))
                return;


@@ -160,7 +155,6 @@ void file_write_init(struct writer *w)
        struct file_write_args_info dummy;
 
        file_cmdline_parser_init(&dummy);
        struct file_write_args_info dummy;
 
        file_cmdline_parser_init(&dummy);

-       w->open = file_write_open;

        w->pre_select = file_write_pre_select;
        w->post_select = file_write_post_select;
        w->parse_config_or_die = file_write_parse_config_or_die;
        w->pre_select = file_write_pre_select;
        w->post_select = file_write_post_select;
        w->parse_config_or_die = file_write_parse_config_or_die;