Removed locking type selection from build_nmh now that it's in configure.

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index b194235..3f004e5 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -152,10 +152,11 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
            if (iswcntrl(wide_char) || iswspace(wide_char)) {
                sp += char_len;
 #else
+            int c;
            end--;
             /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
                intentionally warns if they are passed a char. */
-            int c = *sp;
+            c = *sp;
            if (iscntrl(c) || isspace(c)) {
                sp++;
 #endif
@@ -318,14 +319,20 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
        case FT_LS_COMP:
        case FT_LS_DECODECOMP:
            /*
-            * Trim these components of any newlines
+            * Trim these components of any newlines.
+            *
+            * But don't trim the "body" and "text" components.
             */
-           if (! (fmt->f_comp->c_flags & CF_TRIMMED) &&
-                                       fmt->f_comp->c_text) {
-               int i = strlen(fmt->f_comp->c_text);
-               if (fmt->f_comp->c_text[i - 1] == '\n')
-                   fmt->f_comp->c_text[i - 1] = '\0';
-               fmt->f_comp->c_flags |= CF_TRIMMED;
+
+           comp = fmt->f_comp;
+
+           if (! (comp->c_flags & CF_TRIMMED) && comp->c_text) {
+               i = strlen(comp->c_text);
+               if (comp->c_text[i - 1] == '\n' &&
+                       strcmp(comp->c_name, "body") != 0 &&
+                       strcmp(comp->c_name, "text") != 0)
+                   comp->c_text[i - 1] = '\0';
+               comp->c_flags |= CF_TRIMMED;
            }
            break;
        }