Merge commit 'meins/master'
[paraslash.git] / file_write.c
index 2021526..e03cf8f 100644 (file)
@@ -1,26 +1,18 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file file_write.c simple output plugin for testing purposes */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "string.h"
 #include "fd.h"
@@ -54,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;
 }
@@ -87,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;
@@ -104,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;
@@ -118,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);
 }