aboutsummaryrefslogtreecommitdiffhomepage
path: root/parse_execution.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-07 14:57:58 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-07 14:57:58 -0800
commitb34721b3f458210caeafae7665c6d32962a24f63 (patch)
tree1ae0b7063bc63f63d9f996caf9bb6db70dc192af /parse_execution.cpp
parentcb6be2a50dbf6718fad88c3586e409a53c785324 (diff)
Miscellaneous optimizations to reduce string copying
Diffstat (limited to 'parse_execution.cpp')
-rw-r--r--parse_execution.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/parse_execution.cpp b/parse_execution.cpp
index aeca11a7..c628b1d6 100644
--- a/parse_execution.cpp
+++ b/parse_execution.cpp
@@ -805,11 +805,11 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(job_t
return parse_execution_errored;
}
- wcstring actual_cmd;
+ wcstring path_to_external_command;
if (process_type == EXTERNAL)
{
/* Determine the actual command. This may be an implicit cd. */
- bool has_command = path_get_path(cmd, &actual_cmd);
+ bool has_command = path_get_path(cmd, &path_to_external_command);
/* If there was no command, then we care about the value of errno after checking for it, to distinguish between e.g. no file vs permissions problem */
const int no_cmd_err_code = errno;
@@ -843,7 +843,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(job_t
/* Implicit cd is simple */
argument_list.push_back(L"cd");
argument_list.push_back(cmd);
- actual_cmd.clear();
+ path_to_external_command.clear();
/* If we have defined a wrapper around cd, use it, otherwise use the cd builtin */
process_type = function_exists(L"cd") ? INTERNAL_FUNCTION : INTERNAL_BUILTIN;
@@ -878,7 +878,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(job_t
proc->type = process_type;
proc->set_argv(argument_list);
proc->set_io_chain(process_io_chain);
- proc->actual_cmd = actual_cmd;
+ proc->actual_cmd = path_to_external_command;
return parse_execution_success;
}