/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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 */
/** gengetopt struct that holds the command line args */
static struct filter_args_info conf;
-
-/**
- * standard log function that always writes to stderr
- *
- * \param ll loglevel. If the loglevel of the current message
- * is less than \a ll, the message is going to be ignored.
- *
- * \param fmt the format string describing the log message.
- *
- */
-__printf_2_3 void para_log(int ll, const char* fmt,...)
-{
- va_list argp;
-
- /* ignore log message if loglevel is not high enough */
- if (ll < conf.loglevel_arg)
- return;
- va_start(argp, fmt);
- vfprintf(stderr, fmt, argp);
- va_end(argp);
-}
-
-static void filter_event_handler(struct task *t)
-{
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
- unregister_task(t);
-}
+INIT_STDERR_LOGGING(conf.loglevel_arg);
static void open_filters(void)
{
fc->inbuf = sit->buf;
fc->in_loaded = &sit->loaded;
- fc->input_eof = &sit->eof;
- fc->eof = 0;
- fc->output_eof = &sot->eof;
- fc->task.private_data = fc;
+ fc->input_error = &sit->task.error;
+ fc->task.error = 0;
+ fc->output_error = &sot->task.error;
fc->task.pre_select = filter_pre_select;
- fc->task.event_handler = filter_event_handler;
sprintf(fc->task.status, "filter chain");
for (i = 0; i < conf.filter_given; i++) {
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, ¶ms))
return -E_FILTER_SYNTAX;
}
if (!conf.list_filters_given)
stdout_set_defaults(sot);
sot->buf = fc->outbuf;
sot->loaded = fc->out_loaded;
- sot->input_eof = &fc->eof;
+ sot->input_error = &fc->task.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);
if (ret < 0)
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}