X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspstring.cpp;h=f11ea1248b218fe3a4157957878bbad12fcf2496;hb=da063380e6437178ee3ea99ead971fa384b93a5e;hp=71aed43ba68113840363c5159b1d2bc38ba78802;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspstring.cpp b/src/inspstring.cpp index 71aed43ba..f11ea1248 100644 --- a/src/inspstring.cpp +++ b/src/inspstring.cpp @@ -1,8 +1,19 @@ -#include "inspircd_config.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 "inspstring.h" -#include -#include -#include /* * Copyright (c) 1998 Todd C. Miller @@ -13,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. * @@ -30,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; @@ -108,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; @@ -126,4 +136,3 @@ bool charremove(char* mp, char remove) return shift_down; } -