Port to use getline.h from dxcommon.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index d2359eb451187c0ea2068784b29fb66c445fb69a..634b79e2906a622dddb7bc595d9f8cdaed2d88f6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /*
  *  Helper functions for outputting text.
- *  Copyright © 2011, 2021, 2023 Nick Bowler
+ *  Copyright © 2011, 2021, 2023-2024 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,53 +17,75 @@
  */
 #include <config.h>
 #include <stdio.h>
+#include <limits.h>
 #include <assert.h>
 
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
+#include "parse.h"
+#include "specstr.h"
+
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-       if (amount >= *n) {
-               *n   = 0;
-               *buf = 0;
-       } else {
-               *buf += amount;
-               *n   -= amount;
-       }
+       size_t x = MIN(amount, dst->dstlen);
+
+       dst->dst    += x;
+       dst->dstlen -= x;
+       dst->accum  += amount;
 
        return amount;
 }
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
 {
-       size_t ret, rc;
+       size_t srclen = strlen(src);
 
-       if (!amount)
-               return 0;
+       if (dstlen > 0) {
+               memcpy(dst, src, MIN(dstlen, srclen+1));
+               if (dstlen <= srclen)
+                       dst[dstlen-1] = 0;
+       }
 
-       ret = cdecl__advance_(buf, n, amount);
-       rc = snprintf(*buf, *n, " ");
-       return ret + cdecl__advance_(buf, n, rc);
+       return srclen;
 }
 
-size_t cdecl__emit(char **dst, size_t *dstlen, const char *src)
+size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-       size_t rc = snprintf(*dst, *dstlen, "%s", src);
-       return cdecl__advance_(dst, dstlen, rc);
+       size_t rc = cdecl__strlcpy(dst->dst, src, dst->dstlen);
+       return cdecl__advance(dst, rc);
 }
 
-#include "specstr.h"
+enum {
+       /*
+        * upper bound on number of decimal digits required to convert
+        * cdecl_uintmax.
+        */
+       MAX_UINT_DIGITS = (CHAR_BIT * sizeof (cdecl_uintmax) + 2)/3
+};
 
-static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
+size_t cdecl__emit_uint(struct output_state *dst, cdecl_uintmax val)
 {
-       const char *keyword = spec_string(s->type);
+       char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];
 
-       if (keyword[0] && s->ident)
-               return snprintf(buf, n, "%s %s", keyword, s->ident);
-       else if (s->ident)
-               return snprintf(buf, n, "%s", s->ident);
-       return snprintf(buf, n, "%s", keyword);
+       *(--p) = 0;
+       while (val > 0) {
+               *(--p) = '0' + val % 10;
+               val /= 10;
+       }
+
+       return cdecl__emit(dst, p);
+}
+
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
+{
+       size_t rc;
+
+       rc = cdecl__emit(dst, spec_string(s->type));
+       if (s->ident) {
+               cdecl__emit(dst, " " + !rc);
+               cdecl__emit(dst, s->ident);
+       }
 }
 
 /*
@@ -71,18 +93,21 @@ static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
-                                                 unsigned mask)
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask)
 {
-       size_t ret = 0, rc = 0;
+       const char *sep = " ";
+       int empty = 1;
 
        for (; s; s = s->next) {
                if (!(s->type & mask))
                        continue;
 
-               ret += cdecl__advance(&buf, &n, rc);
-               rc = explain_spec(buf, n, s);
+               cdecl__emit(dst, sep + empty);
+               explain_spec(dst, s);
+               empty = 0;
        }
 
-       return ret + rc;
+       return sep + empty;
 }