X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=9837e810278ee220fce4a313d695db3b9772f3ad;hp=7d63469f8ef68d9ed9e99531c6b31ab7307612dd;hb=e79198e9851faddfd64e47654b5bc66fbc574255;hpb=42ddd68159d7eff0f3e7c225665c97f9abd59425

diff --git a/file_write.c b/file_write.c
index 7d63469f..9837e810 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,17 +8,16 @@
 
 #include <regex.h>
 #include <sys/types.h>
+#include <lopsub.h>
 
+#include "write_cmd.lsg.h"
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "write.h"
-#include "write_common.h"
 #include "string.h"
 #include "fd.h"
-#include "file_write.cmdline.h"
 #include "error.h"
 
 /** Data specific to the file writer. */
@@ -39,7 +38,7 @@ __must_check __malloc static char *random_filename(void)
 	char *result, *home = para_homedir();
 
 	srandom(clock_get_realtime(NULL)->tv_usec);
-	result = make_message("%s/.paraslash/%08lu", home,
+	result = make_message("%s/.paraslash/%08ld", home,
 		para_random(99999999));
 	free(home);
 	return result;
@@ -47,36 +46,36 @@ __must_check __malloc static char *random_filename(void)
 
 static int prepare_output_file(struct writer_node *wn)
 {
-	struct file_write_args_info *conf = wn->conf;
-	char *filename;
-	int ret;
-	struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd));
-
-	if (conf->filename_given)
-		filename = conf->filename_arg;
-	else
-		filename = random_filename();
-	ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
-	if (!conf->filename_given)
-		free(filename);
-	if (ret < 0)
-		goto out;
-	pfwd->fd = ret;
-	ret = mark_fd_blocking(pfwd->fd);
+	const unsigned flags = O_WRONLY | O_CREAT, mode = S_IRUSR | S_IWUSR;
+	int ret, fd;
+	struct private_file_write_data *pfwd;
+
+
+	if (WRITE_CMD_OPT_GIVEN(FILE, FILENAME, wn->lpr)) {
+		const char *path = WRITE_CMD_OPT_STRING_VAL(FILE, FILENAME,
+			wn->lpr);
+		ret = para_open(path, flags, mode);
+	} else {
+		char *path = random_filename();
+		ret = para_open(path, flags, mode);
+		free(path);
+	}
 	if (ret < 0)
-		goto out_close;
-	wn->private_data = pfwd;
+		return ret;
+	fd = ret;
+	ret = mark_fd_blocking(fd);
+	if (ret < 0) {
+		close(fd);
+		return ret;
+	}
+	pfwd = wn->private_data = para_calloc(sizeof(*pfwd));
+	pfwd->fd = fd;
 	return 1;
-out_close:
-	close(pfwd->fd);
-out:
-	free(pfwd);
-	return ret;
 }
 
-static void file_write_pre_select(struct sched *s, struct task *t)
+static void file_write_pre_select(struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -97,17 +96,16 @@ static void file_write_close(struct writer_node *wn)
 	free(pfwd);
 }
 
-static int file_write_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int file_write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_file_write_data *pfwd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	int ret;
 	char *buf;
 	size_t bytes;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(wn->task);
 	if (ret < 0)
 		goto out;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
@@ -132,31 +130,9 @@ out:
 	return ret;
 }
 
-__malloc static void *file_write_parse_config_or_die(int argc, char **argv)
-{
-	struct file_write_args_info *conf = para_calloc(sizeof(*conf));
-
-	/* exits on errors */
-	file_write_cmdline_parser(argc, argv, conf);
-	return conf;
-}
-
-static void file_write_free_config(void *conf)
-{
-	file_write_cmdline_parser_free(conf);
-}
-
 /** the init function of the file writer */
-void file_write_init(struct writer *w)
-{
-	struct file_write_args_info dummy;
-
-	file_write_cmdline_parser_init(&dummy);
-	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->free_config = file_write_free_config;
-	w->close = file_write_close;
-	w->help = (struct ggo_help)DEFINE_GGO_HELP(file_write);
-	file_write_cmdline_parser_free(&dummy);
-}
+struct writer lsg_write_cmd_com_file_user_data = {
+	.pre_select = file_write_pre_select,
+	.post_select = file_write_post_select,
+	.close = file_write_close,
+};