Skip to content
Snippets Groups Projects
Commit 9eb32d6d authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

time to adapt to new exec.h function

parent d40c0e02
No related branches found
No related tags found
No related merge requests found
...@@ -469,8 +469,7 @@ static inline void run_stage2 (char const *const *envp, size_t envlen, char cons ...@@ -469,8 +469,7 @@ static inline void run_stage2 (char const *const *envp, size_t envlen, char cons
char t[tlen + 1] ; char t[tlen + 1] ;
auto_strings(t,sacmdline.s) ; auto_strings(t,sacmdline.s) ;
stralloc_free(&sacmdline) ; stralloc_free(&sacmdline) ;
//xmexec_fm(newargv, envp, envlen, t, tlen) ; xmexec_fm(newargv, envp, envlen, t, tlen) ;
xpathexec_r(newargv, envp, envlen, t, tlen) ;
} }
static inline void run_cmdline(char const *const *newargv, char const *const *envp, char const *msg,char const *arg) 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) ...@@ -755,7 +754,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
} }
close(fdin) ; close(fdin) ;
// xmexec_fm(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ; xmexec_fm(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ;
xpathexec_r(newargv, newenvp, 1, envmodifs.s, envmodifs.len) ;
} }
} }
...@@ -171,7 +171,7 @@ static void scandir_up(char const *scandir, unsigned int timeout, unsigned int n ...@@ -171,7 +171,7 @@ static void scandir_up(char const *scandir, unsigned int timeout, unsigned int n
//log_info("Starts scandir ",scandir," ...") ; //log_info("Starts scandir ",scandir," ...") ;
//xexec_ae(newup[0], newup, envp) ; //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) int main(int argc, char const *const *argv, char const *const *envp)
......
...@@ -146,7 +146,7 @@ int main (int argc, char const *const *argv, char const *const *envp) ...@@ -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) ; if (!r && insist) log_dieusys(LOG_EXIT_SYS,"get file from: ",path) ;
else if ((!r && !insist) || !toparse.len) else if ((!r && !insist) || !toparse.len)
{ {
xpathexec_run(argv[0],argv,envp) ; xexec_ae(argv[0],argv,envp) ;
} }
if (file) if (file)
{ {
...@@ -156,7 +156,7 @@ int main (int argc, char const *const *argv, char const *const *envp) ...@@ -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) ; if (insist) log_dieu(LOG_EXIT_SYS,"find: ",path,file) ;
else 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) ; 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) ...@@ -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") ; if (!env_make (v, r ,dst.s, dst.len)) log_dieusys(LOG_EXIT_SYS,"make environment") ;
v[r] = 0 ; 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) ;
} }
...@@ -75,7 +75,7 @@ static void run_editor(char const *src, char const *const *envp) ...@@ -75,7 +75,7 @@ static void run_editor(char const *src, char const *const *envp)
else log_dieusys(LOG_EXIT_SYS,"get EDITOR") ; else log_dieusys(LOG_EXIT_SYS,"get EDITOR") ;
} }
char const *const newarg[3] = { editor, src, 0 } ; 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) static void do_import(char const *svname, char const *svconf, char const *version, int svtype)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment