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

Eliminate wcs2str

Browse Source 
Use std::string variants everywhere instead
This commit is contained in:
ridiculousfish
2020-07-29 16:37:23 -07:00
parent e4b1fc9f6a
commit db086fc5d4
7 changed files with 25 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/exec.cpp
View File

@@ -110,12 +110,12 @@ static relaxed_atomic_t<int> s_fork_count{0};
auto export_vars = vars.export_arr();
const char *const *envv = export_vars->get();
char *actual_cmd = wcs2str(p->actual_cmd);
std::string actual_cmd = wcs2string(p->actual_cmd);
// Ensure the terminal modes are what they were before we changed them.
restore_term_mode();
// Bounce to launch_process. This never returns.
safe_launch_process(p, actual_cmd, argv_array.get(), envv);
safe_launch_process(p, actual_cmd.c_str(), argv_array.get(), envv);
}
// Returns whether we can use posix spawn for a given process in a given job.