new.c: Order two return statements to match comment.

[nmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9377b393e4237199b50bbb8fc774427bce307a19..791146a21a83203925743d1791b40bc247dafe52 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -14,6 +14,7 @@
 #include <h/tws.h>
 #include <h/fmt_compile.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/fmt_compile.h>
 #include <h/utils.h>

+#include "unquote.h"

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -30,7 +31,7 @@ struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int match (char *, char *);
+static int match (char *, char *) PURE;

 static char *get_x400_friendly (char *, char *, int);
 static int get_x400_comp (char *, char *, char *, int);
 
 static char *get_x400_friendly (char *, char *, int);
 static int get_x400_comp (char *, char *, char *, int);
 


@@ -66,8 +67,13 @@ match (char *str, char *sub)
  * copy a number to the destination subject to a maximum width
  */
 void
  * copy a number to the destination subject to a maximum width
  */
 void

-cpnumber(charstring_t dest, int num, unsigned int wid, char fill, size_t max) {
-    if (wid < (num >= 0 ? max : max-1)) {
+cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
+    /* Maybe we should handle left padding at some point? */
+    if (wid == 0)
+       return;
+    if (wid < 0)
+        wid = -wid; /* OK because wid originally a short. */
+    if ((size_t)wid < (num >= 0 ? max : max-1)) {

        /* Build up the string representation of num in reverse. */
        charstring_t rev = charstring_create (0);
        int i = num >= 0 ? num : -num;
        /* Build up the string representation of num in reverse. */
        charstring_t rev = charstring_create (0);
        int i = num >= 0 ? num : -num;


@@ -117,6 +123,7 @@ void
 cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     int remaining;     /* remaining output width available */
     int rjust;
 cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     int remaining;     /* remaining output width available */
     int rjust;

+    struct charstring *trimmed;

     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */


@@ -135,6 +142,8 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     }
     if (remaining > (int) max) { remaining = max; }
 
     }
     if (remaining > (int) max) { remaining = max; }
 

+    trimmed = rjust ? charstring_create(remaining) : dest;
+

     if ((sp = str)) {
 #ifdef MULTIBYTE_SUPPORT
        if (mbtowc(NULL, NULL, 0)) {} /* reset shift state */
     if ((sp = str)) {
 #ifdef MULTIBYTE_SUPPORT
        if (mbtowc(NULL, NULL, 0)) {} /* reset shift state */


@@ -180,7 +189,7 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
                sp++;
 #endif
                if (!prevCtrl) {
                sp++;
 #endif
                if (!prevCtrl) {

-                   charstring_push_back (dest, ' ');
+                    charstring_push_back (trimmed, ' ');

                    remaining--;
                }
 
                    remaining--;
                }
 


@@ -191,132 +200,146 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
 
 #ifdef MULTIBYTE_SUPPORT
            if (w >= 0 && remaining >= w) {
 
 #ifdef MULTIBYTE_SUPPORT
            if (w >= 0 && remaining >= w) {

-               charstring_push_back_chars (dest, altstr ? altstr : sp,
+                charstring_push_back_chars (trimmed, altstr ? altstr : sp,

                                            char_len, w);
                remaining -= w;
                altstr = NULL;
            }
            sp += char_len;
 #else
                                            char_len, w);
                remaining -= w;
                altstr = NULL;
            }
            sp += char_len;
 #else

-           charstring_push_back (dest, *sp++);
+            charstring_push_back (trimmed, *sp++);

            remaining--;
 #endif
        }
     }
 
            remaining--;
 #endif
        }
     }
 

-    if (rjust) {
-       if (remaining > 0) {
-           /* copy string to the right */
-           charstring_t copy = charstring_copy (dest);
-
-           /* add padding at the beginning */
-           charstring_clear (dest);
-           for (; remaining > 0; --remaining) {
-               charstring_push_back (dest, fill);
-           }
-
-           charstring_append (dest, copy);
+    while (remaining-- > 0) {
+        charstring_push_back(dest, fill);
+    }

 
 

-           charstring_free (copy);
-       }
-    } else {
-       /* pad remaining space */
-       while (remaining-- > 0) {
-           charstring_push_back (dest, fill);
-       }
+    if (rjust) {
+        charstring_append(dest, trimmed);
+        charstring_free(trimmed);

     }
 }
 
     }
 }
 

+#ifdef MULTIBYTE_SUPPORT

 static void
 cpstripped (charstring_t dest, size_t max, char *str)
 {
 static void
 cpstripped (charstring_t dest, size_t max, char *str)
 {

-    int prevCtrl = 1;  /* This is 1 so we strip out leading spaces */
-    int len;
-#ifdef MULTIBYTE_SUPPORT
-    int char_len, w;
-    wchar_t wide_char;
-    char *altstr = NULL;
-#endif /* MULTIBYTE_SUPPORT */
+    static bool deja_vu;
+    static char *oddchar;
+    static size_t oddlen;
+    static char *spacechar;
+    static size_t spacelen;
+    char *end;
+    bool squash;
+    char *src;
+    int srclen;
+    wchar_t rune;
+    int w;

 
 

-    if (!str) {
-       return;
-    }
+    if (!deja_vu) {
+        size_t two;

 
 

-    len = strlen(str);
+        deja_vu = true;

 
 

-#ifdef MULTIBYTE_SUPPORT
-    if (mbtowc(NULL, NULL, 0)) {}  /* Reset shift state */
-#endif /* MULTIBYTE_SUPPORT */
+        two = MB_CUR_MAX * 2; /* Varies at run-time. */

 
 

-    /*
-     * Process each character at a time; if we have multibyte support
-     * then deal with that here.
-     */
+        oddchar = mh_xmalloc(two);
+        oddlen = wcstombs(oddchar, L"?", two);
+        assert(oddlen > 0);

 
 

-    while (*str != '\0' && len > 0 && max > 0) {
-#ifdef MULTIBYTE_SUPPORT
-       char_len = mbtowc(&wide_char, str, len);
+        assert(wcwidth(L' ') == 1); /* Need to pad in ones. */
+        spacechar = mh_xmalloc(two);
+        spacelen = wcstombs(spacechar, L" ", two);
+        assert(spacelen > 0);
+    }

 
 

-       /*
-        * If mbrtowc() failed, then we have a character that isn't valid
-        * in the current encoding, or len wasn't enough for the whole
-        * multi-byte rune to be read.  Replace it with a '?'.  We do that by
-        * setting the alstr variable to the value of the replacement string;
-        * altstr is used below when the bytes are copied into the output
-        * buffer.
-        */
-       if (char_len < 0) {
-           altstr = "?";
-           char_len = mbtowc(&wide_char, altstr, 1);
-       }
+    if (!str)
+        return; /* It's unclear why no padding in this case. */
+    end = str + strlen(str);
+
+    if (mbtowc(NULL, NULL, 0))
+        {} /* Reset shift state. */
+
+    squash = true; /* Trim `space' or `cntrl' from the start. */
+    while (max) {
+        if (!*str)
+            return; /* It's unclear why no padding in this case. */
+
+        srclen = mbtowc(&rune, str, end - str);
+        if (srclen == -1) {
+            /* Invalid rune, or not enough bytes to finish it. */
+            rune = L'?';
+            src = oddchar;
+            srclen = oddlen;
+            str++; /* Skip one byte. */
+        } else {
+            src = str;
+            str += srclen;
+        }

 
 

-       if (char_len <= 0) {
-           break;
-       }
+        if (iswspace(rune) || iswcntrl(rune)) {
+            if (squash)
+                continue; /* Amidst a run of these. */
+            rune = L' ';
+            src = spacechar;
+            srclen = spacelen;
+            squash = true;
+        } else
+            squash = false;
+
+        w = wcwidth(rune);
+        if (w == -1) {
+            rune = L'?';
+            w = wcwidth(rune);
+            assert(w != -1);
+            src = oddchar;
+            srclen = oddlen;
+        }

 
 

-       len -= char_len;
-
-       if (iswcntrl(wide_char) || iswspace(wide_char)) {
-           str += char_len;
-#else /* MULTIBYTE_SUPPORT */
-       int c = (unsigned char) *str;
-       len--;
-       if (iscntrl(c) || isspace(c)) {
-           str++;
-#endif /* MULTIBYTE_SUPPORT */
-           if (! prevCtrl) {
-               charstring_push_back (dest, ' ');
-               --max;
-           }
+        if ((size_t)w > max) {
+            /* No room for rune;  pad. */
+            while (max--)
+                charstring_push_back_chars(dest, spacechar, spacelen, 1);
+            return;
+        }

 
 

-           prevCtrl = 1;
-           continue;
-       }
+        charstring_push_back_chars(dest, src, srclen, w);
+        max -= w;
+    }
+}
+#endif

 
 

-       prevCtrl = 0;
+#ifndef MULTIBYTE_SUPPORT
+static void
+cpstripped (charstring_t dest, size_t max, char *str)
+{
+    bool squash;
+    int c;

 
 

-#ifdef MULTIBYTE_SUPPORT
-       w = wcwidth(wide_char);
-       assert(w >= 0);
-       if (max >= (size_t) w) {
-           charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
-           max -= w;
-           str += char_len;
-           altstr = NULL;
-       } else {
-           /* Not enough width available for the last character.  Output
-              space(s) to fill. */
-           while (max-- > 0) {
-               charstring_push_back (dest, ' ');
-           }
-           break;
-       }
-#else /* MULTIBYE_SUPPORT */
-       charstring_push_back (dest, *str++);
-        --max;
-#endif /* MULTIBYTE_SUPPORT */
+    if (!str)
+       return;
+
+    squash = true; /* Strip leading cases. */
+    while (max--) {
+        c = (unsigned char)*str++;
+        if (!c)
+            return;
+
+       if (isspace(c) || iscntrl(c)) {
+            if (squash)
+                continue;
+            c = ' ';
+            squash = true;
+        } else
+            squash = false;
+
+       charstring_push_back(dest, (char)c);

     }
 }
     }
 }

+#endif

 
 static char *lmonth[] = { "January",  "February","March",   "April",
                          "May",      "June",    "July",    "August",
 
 static char *lmonth[] = { "January",  "February","March",   "April",
                          "May",      "June",    "July",    "August",


@@ -480,7 +503,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            int num = value;
            unsigned int wid;
 
            int num = value;
            unsigned int wid;
 

-           for (wid = num <= 0  ?  1  :  0; num; ++wid, num /= 10) {}
+            for (wid = num <= 0; num; ++wid, num /= 10) {}

            cpnumber (scanlp, value, wid, ' ',
                      max - charstring_chars (scanlp));
            break;
            cpnumber (scanlp, value, wid, ' ',
                      max - charstring_chars (scanlp));
            break;


@@ -818,7 +841,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
        case FT_LV_RCLOCK:
            if ((value = fmt->f_comp->c_tws->tw_clock) == 0)
                value = dmktime(fmt->f_comp->c_tws);
        case FT_LV_RCLOCK:
            if ((value = fmt->f_comp->c_tws->tw_clock) == 0)
                value = dmktime(fmt->f_comp->c_tws);

-           value = time((time_t *) 0) - value;
+           value = time(NULL) - value;

            break;
        case FT_LV_DAYF:
            if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
            break;
        case FT_LV_DAYF:
            if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))


@@ -966,7 +989,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                *comp->c_tws = *tws;
                comp->c_flags &= ~CF_TRUE;
            } else if ((comp->c_flags & CF_DATEFAB) == 0) {
                *comp->c_tws = *tws;
                comp->c_flags &= ~CF_TRUE;
            } else if ((comp->c_flags & CF_DATEFAB) == 0) {

-               memset (comp->c_tws, 0, sizeof *comp->c_tws);
+               ZERO(comp->c_tws);

                comp->c_flags = CF_TRUE;
            }
            comp->c_flags |= CF_PARSED;
                comp->c_flags = CF_TRUE;
            }
            comp->c_flags |= CF_PARSED;


@@ -1183,5 +1206,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
        }
     }
 
        }
     }
 

-    return (NULL);
+    return NULL;

 }
 }