kludge things to compile on old linux

1 files changed, 90 insertions, 0 deletions

diff --git a/src/util.c b/src/util.c
index 29a5399..9c4b447 100644
--- a/src/util.c
+++ b/src/util.c
@@ -187,3 +187,93 @@ bool is_vowel(char c)
         return false;
     }
 }
+
+/*      $NetBSD: strlcat.c,v 1.4 2005/05/16 06:55:48 lukem Exp $        */
+/*      from    NetBSD: strlcat.c,v 1.16 2003/10/27 00:12:42 lukem Exp  */
+/*      from OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp  */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+        size_t dlen;
+
+        /* Find the end of dst and adjust bytes left but don't go past end */
+        while (n-- != 0 && *d != '\0')
+                d++;
+        dlen = d - dst;
+        n = siz - dlen;
+
+        if (n == 0)
+                return(dlen + strlen(s));
+        while (*s != '\0') {
+                if (n != 1) {
+                        *d++ = *s;
+                        n--;
+                }
+                s++;
+        }
+        *d = '\0';
+
+        return(dlen + (s - src));       /* count does not include NUL */
+}
+
+char *format_noun(char *buf, size_t len, const char *name, size_t count, bool default_article, bool capitalize)
+{
+    assert(len > 1);
+    buf[0] = '\0';
+    if(count == 1)
+    {
+        if(default_article)
+        {
+            char *article = capitalize?(is_vowel(name[0])? "An" : "A"):(is_vowel(name[0])? "an" : "a");
+            strlcat(buf, article, len);
+            strlcat(buf, " ", len);
+            strlcat(buf, name, len);
+        }
+        else
+        {
+            char tmp[2];
+            tmp[0] = toupper(name[0]);
+            tmp[1] = '\0';
+            strlcat(buf, tmp, len);
+            strlcat(buf, name + 1, len);
+        }
+    }
+    else
+    {
+        char n[32];
+        snprintf(n, sizeof(n), "%zu", count);
+        strlcat(buf, n, len);
+        strlcat(buf, " ", len);
+        strlcat(buf, name, len);
+        strlcat(buf, "s", len);
+    }
+
+    return buf;
+}