fix a signed/unsigned comparison in PR_UglyValueString

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 4ff60bb9d4c9fd97bb5ca0acd82315c5f84efe1a..e8c0893f2fd5d69b62fd4b265b067513f9bf014f 100644 (file)
--- a/common.c
+++ b/common.c
@@ -675,8 +675,8 @@ void COM_InitArgv (void)
 void COM_InitGameType (void)
 {
        char name[MAX_OSPATH];
-       FS_StripExtension(com_argv[0], name);
-       COM_ToLowerString(name, name);
+       FS_StripExtension (com_argv[0], name, sizeof (name));
+       COM_ToLowerString (name, name, sizeof (name));
 
        if (strstr(name, "transfusion"))
                gamemode = GAME_TRANSFUSION;
@@ -835,7 +835,7 @@ char *va(const char *format, ...)
        s = string[stringindex];
        stringindex = (stringindex + 1) & 7;
        va_start (argptr, format);
-       vsprintf (s, format,argptr);
+       vsnprintf (s, sizeof (string[0]), format,argptr);
        va_end (argptr);
 
        return s;
@@ -843,28 +843,37 @@ char *va(const char *format, ...)
 
 
 //======================================
-// LordHavoc: added these because they are useful
 
-void COM_ToLowerString(const char *in, char *out)
+void COM_ToLowerString (const char *in, char *out, size_t size_out)
 {
-       while (*in)
+       if (size_out == 0)
+               return;
+
+       while (*in && size_out > 1)
        {
                if (*in >= 'A' && *in <= 'Z')
                        *out++ = *in++ + 'a' - 'A';
                else
                        *out++ = *in++;
+               size_out--;
        }
+       *out = '\0';
 }
 
-void COM_ToUpperString(const char *in, char *out)
+void COM_ToUpperString (const char *in, char *out, size_t size_out)
 {
-       while (*in)
+       if (size_out == 0)
+               return;
+
+       while (*in && size_out > 1)
        {
                if (*in >= 'a' && *in <= 'z')
                        *out++ = *in++ + 'A' - 'a';
                else
                        *out++ = *in++;
+               size_out--;
        }
+       *out = '\0';
 }
 
 int COM_StringBeginsWith(const char *s, const char *match)
@@ -937,3 +946,85 @@ char *SearchInfostring(const char *infostring, const char *key)
        }
 }
 
+
+//========================================================
+// strlcat and strlcpy, from OpenBSD
+
+/*
+ * 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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.
+ */
+
+/*     $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
+/*     $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
+
+
+// Most (all?) BSDs already have them
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+
+size_t
+strlcat(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 */
+}
+
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+       register char *d = dst;
+       register const char *s = src;
+       register size_t n = siz;
+
+       /* Copy as many bytes as will fit */
+       if (n != 0 && --n != 0) {
+               do {
+                       if ((*d++ = *s++) == 0)
+                               break;
+               } while (--n != 0);
+       }
+
+       /* Not enough room in dst, add NUL and traverse rest of src */
+       if (n == 0) {
+               if (siz != 0)
+                       *d = '\0';              /* NUL-terminate dst */
+               while (*s++)
+                       ;
+       }
+
+       return(s - src - 1);    /* count does not include NUL */
+}
+
+#endif  // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)