Switch to xpathexec_*

10 files changed, 10 insertions, 20 deletions

diff --git a/src/fdholder/s6-fdholder-daemon.c b/src/fdholder/s6-fdholder-daemon.c
index 0a0f019..ba057d2 100644
--- a/src/fdholder/s6-fdholder-daemon.c
+++ b/src/fdholder/s6-fdholder-daemon.c
@@ -150,7 +150,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
       newargv[m++] = rulesfile ;
     }
     newargv[m++] = 0 ;
-    pathexec_run(newargv[0], newargv, envp) ;
-    strerr_dieexec(111, newargv[0]) ;
+    xpathexec_run(newargv[0], newargv, envp) ;
   }
 }
diff --git a/src/fdholder/s6-fdholder-delete.c b/src/fdholder/s6-fdholder-delete.c
index 94e658b..def559f 100644
--- a/src/fdholder/s6-fdholder-delete.c
+++ b/src/fdholder/s6-fdholder-delete.c
@@ -46,6 +46,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
   newargv[m++] = "--" ;
   newargv[m++] = argv[1] ;
   newargv[m++] = 0 ;
-  pathexec_run(newargv[0], newargv, envp) ;
-  strerr_dieexec(111, newargv[0]) ;
+  xpathexec_run(newargv[0], newargv, envp) ;
 }
diff --git a/src/fdholder/s6-fdholder-getdump.c b/src/fdholder/s6-fdholder-getdump.c
index bb359dc..5e0e3f6 100644
--- a/src/fdholder/s6-fdholder-getdump.c
+++ b/src/fdholder/s6-fdholder-getdump.c
@@ -52,7 +52,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = "7" ;
     while (*argv) newargv[m++] = *argv++ ;
     newargv[m++] = 0 ;
-    pathexec_run(newargv[0], newargv, envp) ;
-    strerr_dieexec(111, newargv[0]) ;
+    xpathexec_run(newargv[0], newargv, envp) ;
   }
 }
diff --git a/src/fdholder/s6-fdholder-getdumpc.c b/src/fdholder/s6-fdholder-getdumpc.c
index 73be61b..f61a45d 100644
--- a/src/fdholder/s6-fdholder-getdumpc.c
+++ b/src/fdholder/s6-fdholder-getdumpc.c
@@ -79,7 +79,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
       }
       modifs[pos++] = 0 ;
     }
-    pathexec_r(argv, envp, env_len(envp), modifs, pos) ;
+    xpathexec_r(argv, envp, env_len(envp), modifs, pos) ;
   }
-  strerr_dieexec(111, argv[0]) ;
 }
diff --git a/src/fdholder/s6-fdholder-list.c b/src/fdholder/s6-fdholder-list.c
index 43f9ec8..ffda680 100644
--- a/src/fdholder/s6-fdholder-list.c
+++ b/src/fdholder/s6-fdholder-list.c
@@ -47,6 +47,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = fmtt ;
   }
   newargv[m++] = 0 ;
-  pathexec_run(newargv[0], newargv, envp) ;
-  strerr_dieexec(111, newargv[0]) ;
+  xpathexec_run(newargv[0], newargv, envp) ;
 }
diff --git a/src/fdholder/s6-fdholder-retrieve.c b/src/fdholder/s6-fdholder-retrieve.c
index 5c76f6e..de98612 100644
--- a/src/fdholder/s6-fdholder-retrieve.c
+++ b/src/fdholder/s6-fdholder-retrieve.c
@@ -56,7 +56,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = "7" ;
     while (*argv) newargv[m++] = *argv++ ;
     newargv[m++] = 0 ;
-    pathexec_run(newargv[0], newargv, envp) ;
-    strerr_dieexec(111, newargv[0]) ;
+    xpathexec_run(newargv[0], newargv, envp) ;
   }
 }
diff --git a/src/fdholder/s6-fdholder-retrievec.c b/src/fdholder/s6-fdholder-retrievec.c
index a74c118..d358e1c 100644
--- a/src/fdholder/s6-fdholder-retrievec.c
+++ b/src/fdholder/s6-fdholder-retrievec.c
@@ -47,6 +47,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     if (uncoe(0) < 0) strerr_diefu1sys(111, "uncoe stdin") ;
   }
   else if (fd_move(0, fd) < 0) strerr_diefu1sys(111, "move fd") ;
-  pathexec_run(argv[1], argv+1, envp) ;
-  strerr_dieexec(111, argv[1]) ;
+  xpathexec_run(argv[1], argv+1, envp) ;
 }
diff --git a/src/fdholder/s6-fdholder-setdump.c b/src/fdholder/s6-fdholder-setdump.c
index fac1381..289c8c0 100644
--- a/src/fdholder/s6-fdholder-setdump.c
+++ b/src/fdholder/s6-fdholder-setdump.c
@@ -44,6 +44,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = fmtt ;
   }
   newargv[m++] = 0 ;
-  pathexec_run(newargv[0], newargv, envp) ;
-  strerr_dieexec(111, newargv[0]) ;
+  xpathexec_run(newargv[0], newargv, envp) ;
 }
diff --git a/src/fdholder/s6-fdholder-store.c b/src/fdholder/s6-fdholder-store.c
index 9dcef8a..7404bac 100644
--- a/src/fdholder/s6-fdholder-store.c
+++ b/src/fdholder/s6-fdholder-store.c
@@ -58,6 +58,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
   newargv[m++] = "--" ;
   newargv[m++] = argv[1] ;
   newargv[m++] = 0 ;
-  pathexec_run(newargv[0], newargv, envp) ;
-  strerr_dieexec(111, newargv[0]) ;
+  xpathexec_run(newargv[0], newargv, envp) ;
 }
diff --git a/src/fdholder/s6-fdholder-transferdump.c b/src/fdholder/s6-fdholder-transferdump.c
index 1f02e90..9cd7ca8 100644
--- a/src/fdholder/s6-fdholder-transferdump.c
+++ b/src/fdholder/s6-fdholder-transferdump.c
@@ -84,6 +84,5 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = fmtto ;
   }
   newargv[m++] = 0 ;
-  pathexec_run(newargv[0], newargv, envp) ;
-  strerr_dieexec(111, newargv[0]) ;
+  xpathexec_run(newargv[0], newargv, envp) ;
 }