2021-10-22 11:56:40
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
|
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2021/10/14 09:22:30 by gbaconni #+# #+# */
|
/* Created: 2021/10/14 09:22:30 by gbaconni #+# #+# */
|
||||||
/* Updated: 2021/10/20 09:31:27 by gbaconni ### ########.fr */
|
/* Updated: 2021/10/22 11:56:11 by gbaconni ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ size_t strnlen(const char *s, size_t maxlen)
|
|||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
len = 0;
|
len = 0;
|
||||||
while (s[len] != '\0' && --maxlen != 0)
|
while (len < maxlen && *s++ != '\0')
|
||||||
len++;
|
len++;
|
||||||
return (len);
|
return (len);
|
||||||
}
|
}
|
||||||
@@ -52,17 +52,21 @@ size_t strlcpy(char *dst, const char *src, size_t dstsize)
|
|||||||
|
|
||||||
size_t strlcat(char *dst, const char *src, size_t dstsize)
|
size_t strlcat(char *dst, const char *src, size_t dstsize)
|
||||||
{
|
{
|
||||||
char *d;
|
size_t srclen;
|
||||||
const char *s;
|
size_t dstlen;
|
||||||
size_t n;
|
size_t cpylen;
|
||||||
|
|
||||||
d = dst;
|
srclen = strlen(src);
|
||||||
d += strlen(d);
|
dstlen = strnlen(dst, dstsize);
|
||||||
s = src;
|
if (dstlen == dstsize)
|
||||||
n = strnlen(s, dstsize);
|
return (dstsize + srclen);
|
||||||
d[n] = '\0';
|
if (srclen < dstsize - dstlen)
|
||||||
memcpy(d, s, n);
|
cpylen = srclen + 1;
|
||||||
return ((d - dst) + n);
|
else
|
||||||
|
cpylen = dstsize - dstlen - 1;
|
||||||
|
memcpy(dst + dstlen, src, cpylen);
|
||||||
|
dst[dstsize - 1] = '\0';
|
||||||
|
return (dstlen + srclen);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user