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 | 23 | ||||
| -rw-r--r-- | src/common/util.h | 1 |
6 files changed, 1 insertions, 118 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 7b5612dd..f4418a75 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -31,7 +31,6 @@ EXTRA_DIST = \ servlist.h \ ssl.h \ ssl.c \ - strlutil.c \ text.h \ textenums.h \ textevents.h \ @@ -59,7 +58,7 @@ endif libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.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) strlutil.c text.c tree.c url.c userlist.c util.c + $(ssl_c) text.c tree.c url.c userlist.c util.c libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) textenums.h: textevents.h diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 2595912a..b4fa224a 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -33,7 +33,6 @@ <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" /> @@ -67,7 +66,6 @@ <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 ceeea660..d94ec2d3 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -110,9 +110,6 @@ <ClInclude Include="..\..\config-win32.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="strlutil.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="typedef.h"> <Filter>Header Files</Filter> </ClInclude> @@ -196,8 +193,5 @@ <ClCompile Include="hexchat.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 deleted file mode 100644 index c823c1e8..00000000 --- a/src/common/strlutil.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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 deleted file mode 100644 index 2d66bc6d..00000000 --- a/src/common/strlutil.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ - -#ifndef HEXCHAT_STRLUTIL_H -#define HEXCHAT_STRLUTIL_H - -size_t strlcat(char *dst, const char *src, size_t siz); -size_t strlcpy(char *dst, const char *src, size_t siz); - -#endif diff --git a/src/common/util.h b/src/common/util.h index b375abb1..9e2d9f52 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -33,7 +33,6 @@ #ifndef HEXCHAT_UTIL_H #define HEXCHAT_UTIL_H -#include "strlutil.h" #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)]) extern const unsigned char rfc_tolowertab[]; |