Ok, readd strlcat.c, use strlcat instead of strncat

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@74 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/Makefile b/Makefile
index cc906a76d54a50fe28f068b6eeebad467b80f037..abe6483d04a2d26418a408546ea5e0f892437080 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CC = gcc
 LDFLAGS = 
 CFLAGS = -g3 $(optimize) -Wall $(DEFS)
 DEFS = -DVERSION=\"$(VERSION)\"
-SRCS = virus.c ttyrec.c dgamelaunch.c io.c ttyplay.c stripgfx.c strlcpy.c
+SRCS = virus.c ttyrec.c dgamelaunch.c io.c ttyplay.c stripgfx.c strlcpy.c strlcat.c
 OBJS = $(SRCS:.c=.o)
 LIBS = -lncurses -lcrypt -lutil
 

diff --git a/dgamelaunch.c b/dgamelaunch.c
index eb1a3c48fb3baada7511a550670522e631946dfe..29c194e44e3cf780514b3f22baa335c88afa7120 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -223,7 +223,7 @@ loadbanner (struct dg_banner *ban)
                 bufnew[i] = *(b++);
               else
                 {
-                  strncat (bufnew, VERSION, 80 - i);
+                  strlcat (bufnew, VERSION, 80 - i);
                   b += 8;       /* skip the whole $VERSION string */
                   i += ARRAY_SIZE (VERSION);
                 }

diff --git a/dgamelaunch.h b/dgamelaunch.h
index bb5a1813e968e228b682f025cdc6afd178e24b9e..20dd3ad3c62932193953c27fa43eae94a52bfc62 100644 (file)
--- a/dgamelaunch.h
+++ b/dgamelaunch.h
@@ -75,5 +75,6 @@ extern void graceful_exit (int status);
 
 /* strlcpy.c */
 extern size_t strlcpy (char *dst, const char *src, size_t siz);
+extern size_t strlcat (char *dst, const char *src, size_t siz);
 
 #endif

diff --git a/strlcat.c b/strlcat.c
new file mode 100644 (file)
index 0000000..b606446
--- /dev/null
+++ b/strlcat.c
@@ -0,0 +1,76 @@
+/*     $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $     */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid =
+       "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * 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 (dst, src, siz)
+                char *dst;
+                const char *src;
+                size_t siz;
+{
+       register char *d = dst;
+       register const char *s = src;
+       register 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 */
+}