Allow a space in $originalmail N$ substitution.

diff --git a/ChangeLog b/ChangeLog
index 7a702c82090c0f2c89bfed70a5af818d0d5ee6cf..c0f4ab5eb6ad9e059241955f0599ca5c2a49ecec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Allow a space in $originalmail N$ substitution
  o Add $text T$ substitution
  o Add $$ substitution
  o Allow list texts to include real UTF-8 characters, as documented

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 8821b6d6047c9681b4d507d89d0b8b569ed140ab..36c50b229e4a6d79d770689455b0233e846247bc 100644 (file)
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -484,6 +484,10 @@ char *prepstdreply(const char *listdir, const char *purpose, const char *action,
                        *tmp = '\0';
                        tmp += 13;
                        str = tmp;
+                       if (*tmp == ' ') {
+                               tmp++;
+                               str = tmp;
+                       }
                        while (*tmp >= '0' && *tmp <= '9')
                                tmp++;
                        if (*tmp == '$') {
@@ -513,10 +517,10 @@ char *prepstdreply(const char *listdir, const char *purpose, const char *action,
                                    }
                                    close(mailfd);
                                } else {
-                                   log_error(LOG_ARGS, "Could not substitute $originalmail%d$ (mailname == %s)",len,mailname);
+                                   log_error(LOG_ARGS, "Could not substitute $originalmail %d$ (mailname == %s)",len,mailname);
                                }
                        } else {
-                               log_error(LOG_ARGS, "Bad $originalmailNNN$ substitution");
+                               log_error(LOG_ARGS, "Bad $originalmail N$ substitution");
                        }
                        myfree(utfline);
                } else {