aboutsummaryrefslogtreecommitdiffhomepage
path: root/exec.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-15 01:40:40 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-15 01:40:40 -0800
commit53814983ff5404d0d2a53069ed2bc951a85ea0ee (patch)
tree7b9cbd5e5506d2d6237515bfdf9fd7afa0472d23 /exec.cpp
parente2fe8730496eb8019e8f8ace211eeaa596534942 (diff)
Update style and formatting to conform to fish style guide.
Diffstat (limited to 'exec.cpp')
-rw-r--r--exec.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/exec.cpp b/exec.cpp
index dba7b534..832c8884 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -582,7 +582,7 @@ static void exec_no_exec(parser_t &parser, const job_t *job)
/* With the new parser, commands aren't responsible for pushing / popping blocks, so there's nothing to do */
return;
}
-
+
/* Hack hack hack. If this is an 'end' job, then trigger a pop. If this is a job that would create a block, trigger a push. See #624 */
const process_t *p = job->first_process;
if (p && p->type == INTERNAL_BUILTIN)
@@ -988,7 +988,7 @@ void exec_job(parser_t &parser, job_t *j)
}
break;
}
-
+
case INTERNAL_BUILTIN:
{
int builtin_stdin=0;
@@ -1133,20 +1133,20 @@ void exec_job(parser_t &parser, job_t *j)
}
break;
}
-
+
case EXTERNAL:
/* External commands are handled in the next switch statement below */
break;
-
+
case INTERNAL_EXEC:
/* We should have handled exec up above */
assert(0 && "INTERNAL_EXEC process found in pipeline, where it should never be. Aborting.");
break;
-
+
case INTERNAL_BUFFER:
/* Internal buffers are handled in the next switch statement below */
break;
-
+
}
if (exec_error)
@@ -1507,7 +1507,7 @@ void exec_job(parser_t &parser, job_t *j)
break;
}
-
+
case INTERNAL_EXEC:
{
/* We should have handled exec up above */
@@ -1581,7 +1581,7 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst, boo
int prev_subshell = is_subshell;
const int prev_status = proc_get_last_status();
char sep=0;
-
+
//fprintf(stderr, "subcmd %ls\n", cmd.c_str());
const env_var_t ifs = env_get_string(L"IFS");