Fix a bug in new logging API (global logstreams weren't notified of events if a speci...

[user/henk/code/inspircd.git] / src / inspstring.cpp

diff --git a/src/inspstring.cpp b/src/inspstring.cpp
index d8df39e1883f9d4fd95b77a20c22a27fa395a0b0..695b9af6b8a99c07e33bdc4a832994d1fe03b4b8 100644 (file)
--- a/src/inspstring.cpp
+++ b/src/inspstring.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,9 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDstring */
+
 #include "inspstring.h"
-#include <string.h>
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -42,66 +43,65 @@
  */
  
 #ifndef HAS_STRLCPY
-size_t strlcat(char *dst, const char *src, size_t siz)
+CoreExport size_t strlcat(char *dst, const char *src, size_t siz)
 {
-  char *d = dst;
-  const char *s = src;
-  size_t n = siz, dlen;
+       char *d = dst;
+       const char *s = src;
+       size_t n = siz, dlen;
 
-  while (n-- != 0 && *d != '\0')
-    d++;
+       while (n-- != 0 && *d != '\0')
+               d++;
 
-  dlen = d - dst;
-  n    = siz - dlen;
+       dlen = d - dst;
+       n = siz - dlen;
 
-  if (n == 0)
-    return(dlen + strlen(s));
+       if (n == 0)
+               return(dlen + strlen(s));
 
-  while (*s != '\0')
-  {
-    if (n != 1)
-    {
-      *d++ = *s;
-      n--;
-    }
+       while (*s != '\0')
+       {
+               if (n != 1)
+               {
+                       *d++ = *s;
+                       n--;
+               }
 
-    s++;
-  }
+               s++;
+       }
 
-  *d = '\0';
-  return(dlen + (s - src)); /* count does not include NUL */
+       *d = '\0';
+       return(dlen + (s - src)); /* count does not include NUL */
 }
 
-size_t strlcpy(char *dst, const char *src, size_t siz)
+CoreExport size_t strlcpy(char *dst, const char *src, size_t siz)
 {
-  char *d = dst;
-  const char *s = src;
-  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 */
+       char *d = dst;
+       const char *s = src;
+       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
 
-int charlcat(char* x,char y,int z)
+CoreExport int charlcat(char* x,char y,int z)
 {
        char* x__n = x;
        int v = 0;
@@ -118,7 +118,7 @@ int charlcat(char* x,char y,int z)
        return v;
 }
 
-bool charremove(char* mp, char remove)
+CoreExport bool charremove(char* mp, char remove)
 {
        char* mptr = mp;
        bool shift_down = false;