Pass current folder to external search tool

Or "/", if needed

diff --git a/init.h b/init.h
index f485ce7e5d8679fad80398e88f1a0b65d18797b2..4a1ec9af49e09d7d91001f83a85d6f5a4720a2b9 100644 (file)
--- a/init.h
+++ b/init.h
@@ -939,6 +939,11 @@ struct ConfigDef MuttVars[] = {
    ** runs the old but well loved mairix indexer with the arguments
    ** given to mairix_filter, in the "raw" mode of mairix, producing
    ** on the standard output a list of Message-IDs, one per line.
+   ** .pp
+   ** If possible, it also filters down the results coming from mairix
+   ** such that only messages in the current folder remain.  It can do
+   ** this because it gets a hidden first argument which is the path
+   ** to the folder.
    ** (This can be the type of clean and simple script called a \fIone-liner\fP.)
    ** .pp
    ** Now if NeoMutt gets a limit or tag command followed by the pattern

diff --git a/pattern.c b/pattern.c
index 568c00184765c1c5ef7d45f76ca6c54043ac64ef..51b906750e280906777207de2716d800bc0ee3b4 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -297,6 +297,19 @@ static bool eat_query(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
   mutt_buffer_init(&cmd_buf);
   mutt_buffer_addstr(&cmd_buf, SearchCommand);
   mutt_buffer_addch(&cmd_buf, ' ');
+  if (!Context || !Context->mailbox)
+  {
+    mutt_buffer_addch(&cmd_buf, '/');
+  }
+  else
+  {
+    char *escaped_folder = mutt_path_escape(Context->mailbox->path);
+    mutt_debug(2, "escaped folder path: %s\n", escaped_folder);
+    mutt_buffer_addch(&cmd_buf, '\'');
+    mutt_buffer_addstr(&cmd_buf, escaped_folder);
+    mutt_buffer_addch(&cmd_buf, '\'');
+  }
+  mutt_buffer_addch(&cmd_buf, ' ');
   mutt_buffer_addstr(&cmd_buf, tok_buf.data);
   FREE(&tok_buf.data);