h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-09 12:11:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate wcsv2strv

Browse Source
This commit is contained in:
ridiculousfish
2014-10-30 18:10:06 -07:00
parent b3b83449cf
commit fa854d7a01
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
exec.cpp
View File

@@ -361,12 +361,14 @@ static void launch_process_nofork(process_t *p)
ASSERT_IS_MAIN_THREAD();
ASSERT_IS_NOT_FORKED_CHILD();
char **argv = wcsv2strv(p->get_argv());
null_terminated_array_t<char> argv_array;
convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
const char *const *envv = env_export_arr(false);
char *actual_cmd = wcs2str(p->actual_cmd.c_str());
/* Bounce to launch_process. This never returns. */
safe_launch_process(p, actual_cmd, argv, envv);
safe_launch_process(p, actual_cmd, argv_array.get(), envv);
}