Renamed env_vars to env_vars_snapshot_t

Cleanup of non-wcstring version of path_get_path

1 files changed, 4 insertions, 4 deletions

diff --git a/parser.cpp b/parser.cpp
index f63df9a2..1e462ba7 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -1979,16 +1979,16 @@ int parser_t::parse_job( process_t *p,
 			*/
 			if( current_block->skip )
 			{
-				p->actual_cmd = wcsdup(L"");
+				p->actual_cmd.clear();
 			}
 			else
 			{
 				int err;
-				p->actual_cmd = path_get_path( args.at(0).completion.c_str() );
+                bool has_command = path_get_path(args.at(0).completion, &p->actual_cmd);
 				err = errno;
 				
                 bool use_implicit_cd = false;
-                if (p->actual_cmd == NULL)
+                if (! has_command)
                 {
                     /* If the specified command does not exist, try using an implicit cd. */
                     wcstring implicit_cd_path;
@@ -2008,7 +2008,7 @@ int parser_t::parse_job( process_t *p,
                 }
                 
 				/* Check if the specified command exists */
-				if( p->actual_cmd == NULL && ! use_implicit_cd )
+				if( ! has_command && ! use_implicit_cd )
 				{
                     
 					int tmp;