X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/69819af4834557e60c33bb378e29cf3d4e8269f8..025963d5fe8ca0781eee8c83c23b4ea1209a3b0b:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2e547286..67f0a03e 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -8,12 +8,19 @@
  * fmt_compile (found in fmt_compile.c).
  */
 
-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
-#include <h/fmt_compile.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "fmt_addr.h"
+#include "dtime.h"
+#include "strindex.h"
+#include "fmt_rfc2047.h"
+#include "uprf.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/fmt_compile.h"
+#include "h/utils.h"
 #include "unquote.h"
 
 #ifdef HAVE_SYS_TIME_H
@@ -63,55 +70,66 @@ match (char *str, char *sub)
     return 1;
 }
 
-/*
- * copy a number to the destination subject to a maximum width
- */
+/* cpnumber formats num as a signed decimal,
+ * appending it to dest if the result doesn't exceed max.
+ * The absolute value of width is the minimum width to produce.
+ * A smaller string is padded;
+ * on the left if width is positive, else the right.
+ * Left-padding uses fill.  It is either ' ' or '0'.
+ * Right-padding is always with space. */
 void
-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;
-
-	do {
-	    charstring_push_back (rev, i % 10  +  '0');
-	    i /= 10;
-	} while (--wid > 0  &&  i > 0);
-	if (i > 0) {
-	    /* Overflowed the field (wid). */
-	    charstring_push_back (rev, '?');
-	} else if (num < 0  &&  wid > 0) {
-	    /* Shouldn't need the wid > 0 check, that's why the condition
-	       at the top checks wid < max-1 when num < 0. */
-	    --wid;
-	    if (fill == ' ') {
-		charstring_push_back (rev, '-');
-	    }
-	}
-	while (wid-- > 0  &&  fill != 0) {
-	    charstring_push_back (rev, fill);
-	}
-	if (num < 0  &&  fill == '0') {
-	    charstring_push_back (rev, '-');
-	}
+cpnumber(charstring_t dest, int num, int width, char fill, size_t max)
+{
+    if (width == 0 || width == INT_MIN) {
+        return;
+    }
+
+    bool padright = width < 0;
+    if (padright) {
+        width = -width; /* Can't overflow after above check. */
+    }
+    size_t w = width;
+    if (w > max) {
+        return; /* The padded result can't fit. */
+    }
+    if (num < 0 && w == 1) {
+        return; /* No room for `-' and a digit or `?'. */
+    }
 
-	{
-	    /* Output the string in reverse. */
-	    size_t b = charstring_bytes (rev);
-	    const char *cp = b  ?  &charstring_buffer (rev)[b]  :  NULL;
+    char *s = m_str(num);
+    size_t len = strlen(s);
+    if (len == w) {
+        charstring_append_cstring(dest, s);
+        return;
+    }
 
-	    for (; b > 0; --b) {
-		charstring_push_back (dest, *--cp);
-	    }
-	}
+    bool neg = *s == '-';
+    if (len < w) {
+        if (padright) {
+            charstring_append_cstring(dest, s);
+            while (len++ < w) {
+                charstring_push_back(dest, ' ');
+            }
+            return;
+        }
+
+        if (neg && fill == '0') {
+            charstring_push_back(dest, *s++);
+        }
+        while (len++ < w) {
+            charstring_push_back(dest, fill);
+        }
+        charstring_append_cstring(dest, s);
+        return;
+    }
 
-	charstring_free (rev);
+    /* Transform 1234567 -> 1234?67 and -1234567 -> 1234-?7. */
+    char *news = s + len - w;
+    if (neg) {
+        *news = '-';
     }
+    news[neg] = '?';
+    charstring_append_cstring(dest, news);
 }
 
 /*
@@ -120,9 +138,10 @@ cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
  * aligned no more than max characters are copied
  */
 void
-cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
+cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max)
+{
     int remaining;     /* remaining output width available */
-    int rjust;
+    bool rjust;
     struct charstring *trimmed;
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
@@ -134,10 +153,10 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     char *sp;          /* current position in source string */
 
     /* get alignment */
-    rjust = 0;
+    rjust = false;
     if ((remaining = wid) < 0) {
 	remaining = -remaining;
-	rjust++;
+	rjust = true;
     }
     if (remaining > (int) max) { remaining = max; }
 
@@ -396,7 +415,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
     char *sp;
     char *savestr, *str;
     char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
-    int i, c, rjust;
+    int i, c;
+    bool rjust;
     int value;
     time_t t;
     size_t max;
@@ -464,11 +484,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	    break;
 	case FT_LITF:
 	    sp = fmt->f_text;
-	    rjust = 0;
+	    rjust = false;
 	    i = fmt->f_width;
 	    if (i < 0) {
 		i = -i;
-		rjust++;		/* XXX should do something with this */
+		rjust = true;		/* XXX should do something with this */
 	    }
 	    while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
 		charstring_push_back (scanlp, c);
@@ -723,10 +743,10 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 		    str = buffer;
 		    while (isspace((unsigned char) *str))
 			    str++;
-		    rjust = 0;
+		    rjust = false;
 		    if ((i = fmt->f_width) < 0) {
 			    i = -i;
-			    rjust++;
+			    rjust = true;
 		    }
 
 		    if (!rjust && i > 0 && (int) strlen(str) > i)