chiark / gitweb /
WIP overhaul of plumbing, databases, etc.
[ypp-sc-tools.web-live.git] / pctb / resolve.c
index 2c61e3b9c035622c844575c570105a5e82ed36c8..556c54b572f3b6eddb56eae5a8c918d941fda7c0 100644 (file)
@@ -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 dictionary-manager 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, "dictionary manager");
+    waitpid_check_exitstatus(resolver_pid, "dictionary-manager");
     fclose(resolver);
     close(resolver_done);
     resolver= 0;