X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=2d82a22c1c890865fa5d5c5c541b133872ed2471;hp=4797b256caf9d6af2c868ee232f733aad19ec18f;hb=db09455b4bf9f7518485e08811d9a2a42e9f0b05;hpb=a95093cd8b62d411b9448aa77768774e1bdd81e5

diff --git a/filter_chain.c b/filter_chain.c
index 4797b256..2d82a22c 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -124,6 +124,8 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t)
 	t->ret = -E_FC_EOF;
 	if (fc->output_eof && *fc->output_eof)
 		goto err_out;
+	if (fc->input_eof && *fc->input_eof && !*fc->in_loaded)
+		goto err_out;
 again:
 	ib = fc->inbuf;
 	loaded = fc->in_loaded;
@@ -141,7 +143,8 @@ again:
 			*loaded -= t->ret;
 			conv += t->ret;
 			if (*loaded && t->ret) {
-				PARA_INFO_LOG("moving %zd bytes in input buffer for %s filter\n",
+				PARA_DEBUG_LOG("moving %zd bytes in input "
+					"buffer for %s filter\n",
 					*loaded,  fn->filter->name);
 				memmove(ib, ib + t->ret, *loaded);
 			}
@@ -150,8 +153,10 @@ again:
 		loaded = &fn->loaded;
 	}
 	conv_total += conv;
-//	PARA_INFO_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
-//		*fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total);
+	PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, "
+		"conv: %d, conv_total: %d\n", *fc->input_eof,
+		fc->output_eof? *fc->output_eof : -42,
+		fc->eof, *fc->out_loaded, conv, conv_total);
 	if (conv)
 		goto again;
 	t->ret = 1;