Fix nasty bugs in `dstr_vputf'.

diff --git a/dstr.c b/dstr.c
index fe65ebebed3064119c7b7502e92e06c18e6da0d7..86cde6e27c962db9eaeb18e59c8b7bea4d605ddd 100644 (file)
--- a/dstr.c
+++ b/dstr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: dstr.c,v 1.7 1999/05/21 22:14:30 mdw Exp $
+ * $Id: dstr.c,v 1.8 1999/06/01 09:47:52 mdw Exp $

  *
  * Handle dynamically growing strings
  *
  *
  * Handle dynamically growing strings
  *


@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.c,v $
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.c,v $

+ * Revision 1.8  1999/06/01 09:47:52  mdw
+ * Fix nasty bugs in `dstr_vputf'.
+ *

  * Revision 1.7  1999/05/21 22:14:30  mdw
  * Take advantage of the new dynamic string macros.
  *
  * Revision 1.7  1999/05/21 22:14:30  mdw
  * Take advantage of the new dynamic string macros.
  *


@@ -278,7 +281,7 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
          goto getnum;
        default:
          if (isdigit((unsigned char)*p)) {
          goto getnum;
        default:
          if (isdigit((unsigned char)*p)) {

-           f |= f_prec;
+           f |= f_wd;

            ip = &wd;
            goto getnum;
          }
            ip = &wd;
            goto getnum;
          }


@@ -291,12 +294,12 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
            DENSURE(&dd, DSTR_PUTFSTEP);
            dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
          } else {
            DENSURE(&dd, DSTR_PUTFSTEP);
            dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
          } else {

-           *ip = *p + '0';
+           *ip = *p - '0';

            DPUTC(&dd, *p);
            p++;
            while (isdigit((unsigned char)*p)) {
              DPUTC(&dd, *p);
            DPUTC(&dd, *p);
            p++;
            while (isdigit((unsigned char)*p)) {
              DPUTC(&dd, *p);

-             *ip = 10 * *ip + *p++ + '0';
+             *ip = 10 * *ip + *p++ - '0';

            }
          }
          break;
            }
          }
          break;