X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=e03cf8f65acea814d5dc62a9e450b056527b06f4;hp=50d3fae7651706cec291f6cbfc4eeb336ba214d0;hb=7cb521f3eeb7fda02344c523989d5903251e673e;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a;ds=sidebyside

diff --git a/file_write.c b/file_write.c
index 50d3fae7..e03cf8f6 100644
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,6 +12,7 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "string.h"
 #include "fd.h"
@@ -45,7 +46,7 @@ static int file_write_open(struct writer_node *wn)
 	if (!conf->filename_given)
 		free(filename);
 	if (pfwd->fd >= 0)
-		return 8192;
+		return 1;
 	free(pfwd);
 	return -E_FW_OPEN;
 }
@@ -78,7 +79,7 @@ static int file_write_post_select(struct sched *s, struct writer_node *wn)
 	if (!FD_ISSET(pfwd->fd, &s->wfds))
 		return 1;
 //	PARA_INFO_LOG("writing %zd\n", *wng->loaded);
-	ret = write(pfwd->fd, wng->buf + wn->written,
+	ret = write(pfwd->fd, *wng->bufp + wn->written,
 		*wng->loaded - wn->written);
 	if (ret < 0)
 		return -E_FW_WRITE;
@@ -95,10 +96,10 @@ static void file_write_close(struct writer_node *wn)
 
 __malloc static void *file_write_parse_config(const char *options)
 {
-	PARA_INFO_LOG("options: %s\n", 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;
@@ -109,10 +110,18 @@ __malloc static void *file_write_parse_config(const char *options)
 /** the init function of the file writer */
 void file_write_init(struct writer *w)
 {
+	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 = file_write_parse_config;
 	w->close = file_write_close;
 	w->shutdown = NULL; /* nothing to do */
+	w->help = (struct ggo_help) {
+		.short_help = file_write_args_info_help,
+		.detailed_help = file_write_args_info_detailed_help
+	};
+	file_cmdline_parser_free(&dummy);
 }