From f92b24221a1b2449b17161d57ae1b4699b82374b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 9 Mar 2012 20:16:26 -0800
Subject: [PATCH] Made pwd a builtin Fixed a thread error when autosuggesting
 with a command substitution

---
 builtin.cpp  | 14 ++++++++++++++
 complete.cpp | 17 ++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/builtin.cpp b/builtin.cpp
index 57c53d793..a48403602 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1470,6 +1470,19 @@ static int builtin_echo( parser_t &parser, wchar_t **argv )
     return STATUS_BUILTIN_OK;
 }
 
+/** The pwd builtin. We don't respect -P to resolve symbolic links because we try to always resolve them. */
+static int builtin_pwd( parser_t &parser, wchar_t **argv )
+{
+	wchar_t dir_path[4096];
+	wchar_t *res = wgetcwd( dir_path, 4096 );
+    if (res == NULL) {
+        return STATUS_BUILTIN_ERROR;
+    } else {
+        stdout_buffer.append(dir_path);
+        stdout_buffer.push_back(L'\n');
+        return STATUS_BUILTIN_OK;
+    }
+}
 
 /**
    The function builtin, used for providing subroutines.
@@ -3601,6 +3614,7 @@ static const builtin_data_t builtin_datas[]=
 	{ 		L"jobs",  &builtin_jobs, N_( L"Print currently running jobs" )   },
 	{ 		L"not",  &builtin_generic, N_( L"Negate exit status of job" )  },
 	{ 		L"or",  &builtin_generic, N_( L"Execute command if previous command failed" )  },
+    { 		L"pwd",  &builtin_pwd, N_( L"Print the working directory" )  },
 	{ 		L"random",  &builtin_random, N_( L"Generate random number" )  },
 	{ 		L"read",  &builtin_read, N_( L"Read a line of input into variables" )   },
 	{ 		L"return",  &builtin_return, N_( L"Stop the currently evaluated function" )   },
diff --git a/complete.cpp b/complete.cpp
index 1d0bc0cb7..2b2686b5f 100644
--- a/complete.cpp
+++ b/complete.cpp
@@ -269,6 +269,14 @@ class completer_t {
     
     bool condition_test( const wcstring &condition );
     
+    expand_flags_t expand_flags() const {
+        /* Never do command substitution in autosuggestions */
+        expand_flags_t result = 0;
+        if (type == COMPLETE_AUTOSUGGEST)
+            result |= EXPAND_SKIP_CMDSUBST;
+        return result;
+    }
+    
     void get_commands_to_load(wcstring_list_t *lst) {
         if (lst)
             lst->insert(lst->end(), commands_to_load.begin(), commands_to_load.end());
@@ -988,7 +996,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use
 		if( use_command && wants_description )
 		{
 			
-			if( expand_string(str, this->completions, ACCEPT_INCOMPLETE | EXECUTABLES_ONLY ) != EXPAND_ERROR )
+			if( expand_string(str, this->completions, ACCEPT_INCOMPLETE | EXECUTABLES_ONLY | this->expand_flags() ) != EXPAND_ERROR )
 			{
 				this->complete_cmd_desc( str );
 			}
@@ -1029,8 +1037,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use
 					
 					if( expand_string( nxt_completion,
 									   this->completions,
-									   ACCEPT_INCOMPLETE |
-									   EXECUTABLES_ONLY ) != EXPAND_ERROR )
+									   ACCEPT_INCOMPLETE | EXECUTABLES_ONLY | this->expand_flags()  ) != EXPAND_ERROR )
 					{
 						for( size_t i=prev_count; i< this->completions.size(); i++ )
 						{
@@ -1098,7 +1105,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use
 			
 				if( expand_string( nxt_completion,
 								   this->completions,
-								   ACCEPT_INCOMPLETE | DIRECTORIES_ONLY ) != EXPAND_ERROR )
+								   ACCEPT_INCOMPLETE | DIRECTORIES_ONLY | this->expand_flags() ) != EXPAND_ERROR )
 				{
 				}
 				free(nxt_completion);
@@ -1489,7 +1496,7 @@ void completer_t::complete_param_expand( const wcstring &sstr, bool do_file)
 	
 	if( expand_string( comp_str,
 					   this->completions,
-					   flags ) == EXPAND_ERROR )
+					   flags | this->expand_flags() ) == EXPAND_ERROR )
 	{
 		debug( 3, L"Error while expanding string '%ls'", comp_str );
 	}