cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove local copies of strl{cat,cpy}.

Browse Source 
Use ours from our libc.
This commit is contained in:
dcoppa 2014-12-03 08:32:28 +00:00
parent 9dd9824f76
commit 1192a4011e
3 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/cntlm/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2013/06/05 09:29:56 dcoppa Exp $
# $OpenBSD: Makefile,v 1.13 2014/12/03 08:32:28 dcoppa Exp $
COMMENT = fast NTLM/NTLMv2 authenticating HTTP proxy
DISTNAME = cntlm-0.93beta5
REVISION = 0
CATEGORIES = www
HOMEPAGE = http://awk.cz/cntlm/

73
www/cntlm/patches/patch-utils_c Normal file
View File

@ -0,0 +1,73 @@
$OpenBSD: patch-utils_c,v 1.1 2014/12/03 08:32:28 dcoppa Exp $
Remove local copies of strl{cat,cpy}.
Use ours from our libc.
--- utils.c.orig Wed Dec 3 02:20:11 2014
+++ utils.c Wed Dec 3 02:20:36 2014
@@ -662,65 +662,6 @@ char *strdup(const char *src) {
#endif
/*
- * More intuitive version of strncpy with string termination
- * from OpenBSD
- */
-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 */
-}
-
-/*
- * More intuitive version os strncat with string termination
- * from OpenBSD
- */
-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 */
-}
-
-/*
* Shortcut for malloc/memset zero.
*/
char *new(size_t size) {

16
www/cntlm/patches/patch-utils_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-utils_h,v 1.3 2014/12/03 08:32:28 dcoppa Exp $
Remove local copies of strl{cat,cpy}.
Use ours from our libc.
--- utils.h.orig Wed Dec 3 02:20:16 2014
+++ utils.h Wed Dec 3 02:21:09 2014
@@ -134,8 +134,6 @@ extern hlist_t hlist_free(hlist_t list);
extern void hlist_dump(hlist_t list);
extern char *substr(const char *src, int pos, int len);
-extern size_t strlcpy(char *dst, const char *src, size_t siz);
-extern size_t strlcat(char *dst, const char *src, size_t siz);
extern char *trimr(char *buf);
extern char *lowercase(char *str);
extern char *uppercase(char *str);