diff --git a/src/66/66-boot.c b/src/66/66-boot.c index eb885e18e10d2b09968a21eba011bec6f84fe70b..cb809a7b2d1a18b9244af010b3e2add1139c8ba6 100644 --- a/src/66/66-boot.c +++ b/src/66/66-boot.c @@ -469,8 +469,7 @@ static inline void run_stage2 (char const *const *envp, size_t envlen, char cons char t[tlen + 1] ; auto_strings(t,sacmdline.s) ; stralloc_free(&sacmdline) ; - //xmexec_fm(newargv, envp, envlen, t, tlen) ; - xpathexec_r(newargv, envp, envlen, t, tlen) ; + xmexec_fm(newargv, envp, envlen, t, tlen) ; } static inline void run_cmdline(char const *const *newargv, char const *const *envp, char const *msg,char const *arg) @@ -755,7 +754,7 @@ int main(int argc, char const *const *argv,char const *const *envp) } close(fdin) ; - // xmexec_fm(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ; - xpathexec_r(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ; + xmexec_fm(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ; + } } diff --git a/src/66/66-scanctl.c b/src/66/66-scanctl.c index 6b40aeccfea58f4ac6503043fda83438293f4ea4..52d33c4aaf47beb378b15bd9ad0a843ca757994e 100644 --- a/src/66/66-scanctl.c +++ b/src/66/66-scanctl.c @@ -171,7 +171,7 @@ static void scandir_up(char const *scandir, unsigned int timeout, unsigned int n //log_info("Starts scandir ",scandir," ...") ; //xexec_ae(newup[0], newup, envp) ; - xpathexec_run(newup[0], newup, envp) ; + xexec_ae(newup[0], newup, envp) ; } int main(int argc, char const *const *argv, char const *const *envp) diff --git a/src/extra-tools/execl-envfile.c b/src/extra-tools/execl-envfile.c index a7265f242a94e4dcf971f292e26e2c8408db60a2..3fb21c26166e037239320f42ac5ba0ef7ace9025 100644 --- a/src/extra-tools/execl-envfile.c +++ b/src/extra-tools/execl-envfile.c @@ -146,7 +146,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!r && insist) log_dieusys(LOG_EXIT_SYS,"get file from: ",path) ; else if ((!r && !insist) || !toparse.len) { - xpathexec_run(argv[0],argv,envp) ; + xexec_ae(argv[0],argv,envp) ; } if (file) { @@ -156,7 +156,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if (insist) log_dieu(LOG_EXIT_SYS,"find: ",path,file) ; else { - xpathexec_run(argv[0],argv,envp) ; + xexec_ae(argv[0],argv,envp) ; } } if (!file_readputsa(&src,path,file)) log_dieusys(LOG_EXIT_SYS,"read file: ",path,file) ; @@ -232,5 +232,5 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!env_make (v, r ,dst.s, dst.len)) log_dieusys(LOG_EXIT_SYS,"make environment") ; v[r] = 0 ; - pathexec_r (v, newenv, env_len(newenv),info.modifs.s,info.modifs.len) ; + mexec_fm (v, newenv, env_len(newenv),info.modifs.s,info.modifs.len) ; } diff --git a/src/lib66/ssexec_env.c b/src/lib66/ssexec_env.c index 62d89a1b67e4ddb7015d4cd66e801ff1ebcb557a..e21407a9c22e543e9c1ece7cf7efcd881db04ef8 100644 --- a/src/lib66/ssexec_env.c +++ b/src/lib66/ssexec_env.c @@ -75,7 +75,7 @@ static void run_editor(char const *src, char const *const *envp) else log_dieusys(LOG_EXIT_SYS,"get EDITOR") ; } char const *const newarg[3] = { editor, src, 0 } ; - xpathexec_run (newarg[0],newarg,envp) ; + xexec_ae (newarg[0],newarg,envp) ; } static void do_import(char const *svname, char const *svconf, char const *version, int svtype)