Add Inspircd::AddServices

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

diff --git a/src/inspstring.cpp b/src/inspstring.cpp
index 83f058b1846de6d78f1ec6780471f48756c02d83..4f4cbd8ad226ad4200ec1d427122cf9ffe5b9af3 100644 (file)
--- a/src/inspstring.cpp
+++ b/src/inspstring.cpp
@@ -1,5 +1,19 @@
-#include "inspstring.h"
-#include <string.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+/* $Core */
+
+#include "inspircd.h"
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -10,9 +24,9 @@
  * 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. 
+ * 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.
  *
@@ -27,68 +41,67 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 #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;
@@ -105,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;
@@ -124,3 +137,18 @@ bool charremove(char* mp, char remove)
        return shift_down;
 }
 
+static const char hextable[] = "0123456789abcdef";
+
+std::string BinToHex(const std::string& data)
+{
+       int l = data.length();
+       std::string rv;
+       rv.reserve(l * 2);
+       for(int i=0; i < l; i++)
+       {
+               unsigned char c = data[i];
+               rv.append(1, hextable[c >> 4]);
+               rv.append(1, hextable[c & 0xF]);
+       }
+       return rv;
+}