aboutsummaryrefslogtreecommitdiffhomepage
path: root/exec.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-26 13:27:31 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-26 13:27:31 -0800
commitb30090f9461f246053b846173c81682018901c7e (patch)
treebe69c50f00b1ceb1b79c9655a679c16abfda0a7c /exec.cpp
parent8f637975a42bf0bbd946fc3ec21993086f3e87b1 (diff)
Some cleanup of completions in preparation for more multithreading
Diffstat (limited to 'exec.cpp')
-rw-r--r--exec.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/exec.cpp b/exec.cpp
index 1d35afab..3de094b9 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -1667,6 +1667,7 @@ void exec( parser_t &parser, job_t *j )
static int exec_subshell_internal( const wcstring &cmd, wcstring_list_t *lst )
{
+ ASSERT_IS_MAIN_THREAD();
char *begin, *end;
char z=0;
int prev_subshell = is_subshell;
@@ -1767,10 +1768,12 @@ static int exec_subshell_internal( const wcstring &cmd, wcstring_list_t *lst )
int exec_subshell( const wcstring &cmd, std::vector<wcstring> &outputs )
{
+ ASSERT_IS_MAIN_THREAD();
return exec_subshell_internal(cmd, &outputs);
}
__warn_unused int exec_subshell( const wcstring &cmd )
{
+ ASSERT_IS_MAIN_THREAD();
return exec_subshell_internal(cmd, NULL);
}