From: Pietro Cerutti <gahr@gahr.ch>
Date: Mon, 9 Apr 2018 15:44:04 +0000 (+0000)
Subject: Expand variables inside backticks
X-Git-Tag: neomutt-20180622~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=690ee1019d795adb06136d868881c03e4eb42f9c;p=neomutt

Expand variables inside backticks

This allows for example to simplify the solution given here [1] as:

```
:set pager_index_lines=`dc -e "50 $pager_index_lines -p"`
```

[1]
http://mailman.neomutt.org/pipermail/neomutt-users-neomutt.org/2018-April/000325.html
---

diff --git a/init.c b/init.c
index b8a0e7c53..1e6bceef3 100644
--- a/init.c
+++ b/init.c
@@ -596,7 +596,7 @@ int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, int flags)
     {
       FILE *fp = NULL;
       pid_t pid;
-      char *cmd = NULL, *ptr = NULL;
+      char *ptr = NULL;
       size_t expnlen;
       struct Buffer expn;
       int line = 0;
@@ -617,15 +617,19 @@ int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, int flags)
         mutt_debug(1, "mismatched backticks\n");
         return -1;
       }
-      cmd = mutt_str_substr_dup(tok->dptr, pc);
-      pid = mutt_create_filter(cmd, NULL, &fp, NULL);
+      struct Buffer cmd;
+      mutt_buffer_init(&cmd);
+      *pc = '\0';
+      mutt_extract_token(&cmd, tok, MUTT_TOKEN_QUOTE | MUTT_TOKEN_SPACE);
+      *pc = '`';
+      pid = mutt_create_filter(cmd.data, NULL, &fp, NULL);
       if (pid < 0)
       {
         mutt_debug(1, "unable to fork command: %s\n", cmd);
-        FREE(&cmd);
+        FREE(&cmd.data);
         return -1;
       }
-      FREE(&cmd);
+      FREE(&cmd.data);
 
       tok->dptr = pc + 1;
 
@@ -2486,7 +2490,6 @@ static int parse_set(struct Buffer *buf, struct Buffer *s, unsigned long data,
         {
           /* myvar is a pointer to buf and will be lost on extract_token */
           myvar = mutt_str_strdup(myvar);
-          myvar_del(myvar);
         }
 
         mutt_extract_token(buf, s, 0);