diff options
| -rw-r--r-- | src/common/Makefile.am | 3 | ||||
| -rw-r--r-- | src/common/common.vcxproj | 2 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 6 | ||||
| -rw-r--r-- | src/common/strlutil.c | 84 | ||||
| -rw-r--r-- | src/common/strlutil.h | 2 | ||||
| -rw-r--r-- | src/common/util.h | 1 |
6 files changed, 97 insertions, 1 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6a35da91..409aa324 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = \ servlist.h \ ssl.h \ ssl.c \ + strlutil.c \ text.h \ textenums.h \ textevents.h \ @@ -54,7 +55,7 @@ SUBDIRS = $(dbusdir) . libxchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \ inbound.c modes.c msproxy.c network.c notify.c outbound.c \ plugin.c plugin-timer.c proto-irc.c server.c servlist.c $(ssl_c) \ - text.c tree.c url.c userlist.c util.c xchat.c + strlutil.c text.c tree.c url.c userlist.c util.c xchat.c libxchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) textevents: make-te diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 595a76fc..4cfb13ed 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -33,6 +33,7 @@ <ClInclude Include="server.h" /> <ClInclude Include="servlist.h" /> <ClInclude Include="ssl.h" /> + <ClInclude Include="strlutil.h" /> <ClInclude Include="text.h" /> <ClInclude Include="textenums.h" /> <ClInclude Include="textevents.h" /> @@ -65,6 +66,7 @@ <ClCompile Include="server.c" /> <ClCompile Include="servlist.c" /> <ClCompile Include="ssl.c" /> + <ClCompile Include="strlutil.c" /> <ClCompile Include="text.c" /> <ClCompile Include="thread.c" /> <ClCompile Include="tree.c" /> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index afb66e63..5be20199 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -110,6 +110,9 @@ <ClInclude Include="..\..\config.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="strlutil.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="cfgfiles.c"> @@ -190,5 +193,8 @@ <ClCompile Include="xchat.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="strlutil.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/common/strlutil.c b/src/common/strlutil.c new file mode 100644 index 00000000..c823c1e8 --- /dev/null +++ b/src/common/strlutil.c @@ -0,0 +1,84 @@ +/* + * 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. + */ + +#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(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + 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 */ +} + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +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) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* 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 */ +} diff --git a/src/common/strlutil.h b/src/common/strlutil.h new file mode 100644 index 00000000..968aab53 --- /dev/null +++ b/src/common/strlutil.h @@ -0,0 +1,2 @@ +size_t strlcat(char *dst, const char *src, size_t siz); +size_t strlcpy(char *dst, const char *src, size_t siz); diff --git a/src/common/util.h b/src/common/util.h index c2f1e118..e7e22524 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -14,6 +14,7 @@ #ifndef XCHAT_UTIL_H #define XCHAT_UTIL_H +#include "strlutil.h" #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)]) extern const unsigned char rfc_tolowertab[]; |