Simplify para_basename().

[paraslash.git] / filter_chain.c

diff --git a/filter_chain.c b/filter_chain.c
index ee94e8ff13fff3c2fdd505e369f1bb88f2ee6e9d..295f2d068a6b15ac32185612feb46999907ff6cb 100644 (file)
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -1,23 +1,14 @@
 /*
  * 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_chain.c common helper functions for filter input/output */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "list.h"
 #include "sched.h"
@@ -124,30 +115,32 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t)
        size_t *loaded;
        int conv, conv_total = 0;
 
-       t->ret = -E_FC_EOF;
-       if (fc->output_eof && *fc->output_eof)
+       if (fc->output_error && *fc->output_error) {
+               t->ret =  *fc->output_error;
                goto err_out;
+       }
 again:
        ib = fc->inbuf;
        loaded = fc->in_loaded;
        conv = 0;
        list_for_each_entry(fn, &fc->filters, node) {
                if (*loaded && fn->loaded < fn->bufsize) {
-                       size_t old_fn_loaded = fn->loaded;
+                       size_t size, old_fn_loaded = fn->loaded;
 //                     PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
 //                             fc, *loaded, fn->filter->name);
                        t->ret = fn->filter->convert(ib, *loaded, fn);
                        if (t->ret < 0)
                                goto err_out;
-                       call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+                       size = t->ret;
+                       call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
                                fn->loaded - old_fn_loaded);
-                       *loaded -= t->ret;
-                       conv += t->ret;
-                       if (*loaded && t->ret) {
+                       *loaded -= size;
+                       conv += size;
+                       if (*loaded && size) {
 //                             PARA_DEBUG_LOG("moving %zd bytes in input "
 //                                     "buffer for %s filter\n",
 //                                     *loaded,  fn->filter->name);
-                               memmove(ib, ib + t->ret, *loaded);
+                               memmove(ib, ib + size, *loaded);
                        }
                }
                ib = fn->buf;
@@ -161,7 +154,7 @@ again:
        if (conv)
                goto again;
        t->ret = 1;
-       if (!*fc->input_eof)
+       if (!*fc->input_error)
                return;
        if (*fc->out_loaded)
                return;
@@ -169,7 +162,7 @@ again:
                return;
        t->ret = -E_FC_EOF;
 err_out:
-       fc->eof = 1;
+       fc->error = t->ret;
 }
 
 /**