X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Fresolve.c;h=e89d2054e91a0e076c685a03b6f1a2273d8415e2;hp=556c54b572f3b6eddb56eae5a8c918d941fda7c0;hb=e5d2e8a38c0c33838ce27df69a24d43706fa41c1;hpb=6a3c0962283d32bc6e5f6c47c929baf37ddc642f diff --git a/pctb/resolve.c b/pctb/resolve.c index 556c54b..e89d205 100644 --- a/pctb/resolve.c +++ b/pctb/resolve.c @@ -25,6 +25,7 @@ * sponsored by Three Rings. */ +#include "convert.h" #include "ocr.h" static FILE *resolver; @@ -49,7 +50,9 @@ FILE *resolve_start(void) { * so we aren't in any danger of overwriting some other fd 4: */ sysassert( dup2(donepipe[1],4) ==4 ); EXECLP_HELPER("dictionary-manager", - DEBUGP(callout) ? "--debug" : "--noop-arg", + DEBUGP(callout) ? "--debug" : "--noop-arg", + DEBUGP(callout) && DEBUGP(rect) ? "--debug-rect" : "--noop-arg", + o_quiet ? "--quiet" : "--noop-arg", "--automatic-1", (char*)0); sysassert(!"execlp dictionary-manager --automatic failed"); @@ -59,6 +62,8 @@ FILE *resolve_start(void) { resolver= fdopen(jobpipe[1],"w"); sysassert(resolver); resolver_done= donepipe[0]; } + + progress(""); return resolver; } @@ -78,7 +83,7 @@ void resolve_finish(void) { } if (r==0) { - waitpid_check_exitstatus(resolver_pid, "dictionary-manager"); + waitpid_check_exitstatus(resolver_pid, "dictionary-manager", 0); fclose(resolver); close(resolver_done); resolver= 0;