Don't parse parse # lines with mhbuild -nodirectives.

diff --git a/Makefile.am b/Makefile.am
index f1868ec..3f00dc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/install-mh/test-install-mh test/install-mh/test-version-check \
        test/locking/test-datalocking test/locking/test-spoollocking \
        test/manpages/test-manpages \
-       test/mhbuild/test-attach \
+       test/mhbuild/test-attach test/mhbuild/test-mhbuild \
        test/mhbuild/test-cte \
        test/mhbuild/test-ext-params \
        test/mhbuild/test-forw test/mhbuild/test-header-encode \

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 90b903a..838ae10 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -104,3 +104,5 @@ BUG FIXES
   if needed after decoding text parts.
 - mhbuild now checks whether all text parts need a Content-Transfer-Encoding
   header, not just those with a character set not specified.
+- mhbuild no longer parses lines that start with # as directives with
+  -nodirectives.

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index df346fe..cf41bfb 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -621,7 +621,7 @@ fgetstr (char *s, int n, FILE *stream)
            if (!fgets (cp, n, stream))
                 return cp == s ? NULL : s; /* "\\\nEOF" ignored. */
 
-           if (cp == s && *cp != '#')
+           if (! do_direct()  ||  (cp == s && *cp != '#'))
                return s; /* Plaintext line. */
 
            len = strlen(cp);