X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=pctb%2Fresolve.c;h=556c54b572f3b6eddb56eae5a8c918d941fda7c0;hb=e888c1dd3476ca49bccf82b93b4a3633587d400d;hp=052ec32fbb3981451ee25f3186a198c936f4c4fd;hpb=4c375a59891a4161e30bd67709a1ad5d1950a850;p=ypp-sc-tools.db-test.git diff --git a/pctb/resolve.c b/pctb/resolve.c index 052ec32..556c54b 100644 --- a/pctb/resolve.c +++ b/pctb/resolve.c @@ -48,11 +48,11 @@ FILE *resolve_start(void) { /* we know donepipe[1] is >= 4 and we have dealt with all the others * so we aren't in any danger of overwriting some other fd 4: */ sysassert( dup2(donepipe[1],4) ==4 ); - execlp(o_resolver, o_resolver, - DEBUGP(callout) ? "--debug" : "--noop-arg", - "--automatic-1", - (char*)0); - sysassert(!"execlp ocr-resolver failed"); + EXECLP_HELPER("dictionary-manager", + DEBUGP(callout) ? "--debug" : "--noop-arg", + "--automatic-1", + (char*)0); + sysassert(!"execlp dictionary-manager --automatic failed"); } sysassert(! close(jobpipe[0]) ); sysassert(! close(donepipe[1]) ); @@ -78,7 +78,7 @@ void resolve_finish(void) { } if (r==0) { - waitpid_check_exitstatus(resolver_pid, "character resolver"); + waitpid_check_exitstatus(resolver_pid, "dictionary-manager"); fclose(resolver); close(resolver_done); resolver= 0;