/*
- * 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.
*/
#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
#include <sys/time.h>
#include <stdbool.h>
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;
- struct private_file_write_data *pfwd = wn->private_data;
char *filename;
int ret;
+ struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
if (conf->filename_given)
filename = conf->filename_arg;
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);
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_file_write_data *pfwd = wn->private_data;
- int ret;
+ int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
- t->error = 0;
- ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
- if (ret > 0 && pfwd->fd >= 0)
- para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
- else if (ret != 0) /* error or bos and fd not yet open */
- sched_min_delay(s);
+ if (ret == 0)
+ return;
+ if (ret < 0 || !pfwd)
+ return sched_min_delay(s);
+ para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
}
static void file_write_close(struct writer_node *wn)
{
struct private_file_write_data *pfwd = wn->private_data;
- if (pfwd->fd >= 0)
- close(pfwd->fd);
+ if (!pfwd)
+ return;
+ close(pfwd->fd);
free(pfwd);
}
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);
- if (ret < 0)
- goto out;
+ goto out;
}
if (!FD_ISSET(pfwd->fd, &s->wfds))
return;
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;