/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
sizeof(struct private_file_write_data));
struct file_write_args_info *conf = wn->conf;
char *filename;
+ int ret;
if (conf->filename_given)
filename = conf->filename_arg;
else
filename = random_filename();
wn->private_data = pfwd;
- pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
if (!conf->filename_given)
free(filename);
- if (pfwd->fd >= 0)
+ if (ret < 0)
+ goto out;
+ pfwd->fd = ret;
+ ret = mark_fd_blocking(pfwd->fd);
+ if (ret >= 0)
return 1;
+ close(pfwd->fd);
+out:
free(pfwd);
- return -E_FW_OPEN;
+ return ret;
}
static void file_write_pre_select(struct sched *s, struct task *t)
t->error = ret;
}
-__malloc static void *file_write_parse_config(const char *options)
+__malloc static void *file_write_parse_config_or_die(const char *options)
{
- struct file_write_args_info *conf
- = para_calloc(sizeof(struct file_write_args_info));
- int ret = file_cmdline_parser_string(options, conf, "file_write");
-
- PARA_INFO_LOG("conf->filename_given: %d\n", conf->filename_given);
- if (!ret)
- return conf;
- free(conf);
- return NULL;
+ struct file_write_args_info *conf = para_calloc(sizeof(*conf));
+
+ /* exits on errors */
+ file_cmdline_parser_string(options, conf, "file_write");
+ return conf;
}
static void file_write_free_config(void *conf)
w->open = file_write_open;
w->pre_select = file_write_pre_select;
w->post_select = file_write_post_select;
- w->parse_config = file_write_parse_config;
+ w->parse_config_or_die = file_write_parse_config_or_die;
w->free_config = file_write_free_config;
w->close = file_write_close;
w->shutdown = NULL; /* nothing to do */