Added cpytrim() function. Unlike trimcpy(), it does not modify

its argument.

diff --git a/h/prototypes.h b/h/prototypes.h
index 2d798e203a718676cf11ec8da26ae6138faef8b8..ae6a115e059b281ad1c94a2b7fa7ee9bd17b56ed 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -51,6 +51,7 @@ char *copy (const char *, char *);
 char **copyip (char **, char **, int);
 void cpydata (int, int, char *, char *);
 void cpydgst (int, int, char *, char *);
+char *cpytrim (const char *);
 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
 int default_done (int);

diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c
index 3a2fbd763fb991b633b9b29136d4f251bd305cf6..6bcf3aec693d3002bd934ee2513f56277bb50d86 100644 (file)
--- a/sbr/trimcpy.c
+++ b/sbr/trimcpy.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 char *
@@ -38,3 +39,36 @@ trimcpy (char *cp)
     /* now return a copy */
     return getcpy(cp);
 }
+
+
+/*
+ * cpytrim() -- return a copy of the argument with:
+ *           -- stripped leading and trailing whitespace, and
+ *           -- internal whitespace replaced with spaces.
+ *
+ * This code is Copyright (c) 2013, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
+ */
+char *
+cpytrim (const char *sp) {
+    char *dp;
+    char *cp;
+
+    /* skip over leading whitespace */
+    while (isspace ((unsigned char) *sp)) ++sp;
+
+    dp = add (sp, NULL);
+
+    /* start at the end and zap trailing whitespace */
+    for (cp = dp + strlen (dp) - 1;
+         cp >= dp  &&  isspace ((unsigned char) *cp);
+         *cp-- = '\0') continue;
+
+    /* replace remaining whitespace with spaces */
+    for (cp = dp; *cp; ++cp) {
+        if (isspace ((unsigned char) *cp)) *cp = ' ';
+    }
+
+    return dp;
+}

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index a4e831a068014dd4baefaed342181bc719e7d2cf..bc29243b8e6ee1e4d2b41c49745685f055ff0ed0 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -198,8 +198,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
     if (ct->c_descr) {
        char *dp;
 
-       dp = trimcpy (cp = add (ct->c_descr, NULL));
-       free (cp);
+       dp = cpytrim (ct->c_descr);
        printf (LSTFMT2d1, dp);
        free (dp);
     }
@@ -220,8 +219,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug)
        if (ci->ci_comment) {
            char *dp;
 
-           dp = trimcpy (cp = add (ci->ci_comment, NULL));
-           free (cp);
+           dp = cpytrim (ci->ci_comment);
            snprintf (buffer, sizeof(buffer), "(%s)", dp);
            free (dp);
            printf (LSTFMT2d2, buffer);