X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=27bbe63ee190b989e9396cff9e27763859ac2d38;hp=ee3d965596a37069b17cab629216cbf08a05229f;hb=1714e2b80218ef5d7e0275a93f8c2dd9b1809861;hpb=b9f9601828dd1a103ec9315bd430d39b458d2b80;ds=sidebyside

diff --git a/filter.c b/filter.c
index ee3d9655..27bbe63e 100644
--- a/filter.c
+++ b/filter.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 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 filter.c the stand-alone filter program */
 
@@ -78,9 +66,9 @@ static int init_filter_chain(void)
 
 	fc->inbuf = sit->buf;
 	fc->in_loaded = &sit->loaded;
-	fc->input_eof = &sit->eof;
-	fc->eof = 0;
-	fc->output_eof = &sot->eof;
+	fc->input_error = &sit->error;
+	fc->error = 0;
+	fc->output_error = &sot->error;
 	fc->task.private_data = fc;
 	fc->task.pre_select = filter_pre_select;
 	fc->task.event_handler = filter_event_handler;
@@ -114,13 +102,20 @@ static int parse_config(int argc, char *argv[])
 
 	if (filter_cmdline_parser(argc, argv, &conf))
 		return -E_FILTER_SYNTAX;
+	HANDLE_VERSION_FLAG("filter", conf);
 	if (!cf) {
 		char *home = para_homedir();
 		cf = make_message("%s/.paraslash/filter.conf", home);
 		free(home);
 	}
 	if (!stat(cf, &statbuf)) {
-		if (filter_cmdline_parser_configfile(cf, &conf, 0, 0, 0))
+		struct filter_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		if (filter_cmdline_parser_config_file(cf, &conf, &params))
 			return -E_FILTER_SYNTAX;
 	}
 	if (!conf.list_filters_given)
@@ -165,14 +160,14 @@ int main(int argc, char *argv[])
 	stdout_set_defaults(sot);
 	sot->buf = fc->outbuf;
 	sot->loaded = fc->out_loaded;
-	sot->input_eof = &fc->eof;
+	sot->input_error = &fc->error;
 
-	register_task(&sot->task);
-	register_task(&fc->task);
 	register_task(&sit->task);
+	register_task(&fc->task);
+	register_task(&sot->task);
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = sched(&s);
+	ret = schedule(&s);
 out:
 	free(sit->buf);
 	close_filters(fc);