h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 03:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite str2wcstring to properly handle embedded nulls, and be simpler

Browse Source
This commit is contained in:
ridiculousfish
2012-12-20 12:25:35 -08:00
parent d5af389d2e
commit ce15abd577
3 changed files with 71 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
exec.cpp
View File

@@ -1459,7 +1459,7 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst)
proc_set_last_status(prev_status);
is_subshell = prev_subshell;
if (lst != NULL)
{
const char *begin = io_buffer->out_buffer_ptr();
@@ -1478,12 +1478,12 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst)
// Stop now points at the first character we do not want to copy)
const wcstring wc = str2wcstring(cursor, stop - cursor);
lst->push_back(wc);
// If we hit a separator, skip over it; otherwise we're at the end
cursor = stop + (hit_separator ? 1 : 0);
}
}
io_buffer_destroy(io_buffer);
return status;
}