devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

strlcat use strlcpy for the copy part

Browse source 
Change-Id: I729b292a58d9f6542e58ac01d1dc90d36175886d
This commit is contained in:
William Wilgus 2022-11-16 00:36:47 -05:00
parent 28af87526d
commit 7733abce29
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
firmware/common/strlcat.c
View file

@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <string.h>
#include "string-extra.h"
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
@ -29,9 +29,7 @@ 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;
size_t dlen, n = siz;
/* Find the end of dst and adjust bytes left but don't go past end */
while (n-- != 0 && *d != '\0')
@ -39,17 +37,6 @@ strlcat(char *dst, const char *src, size_t siz)
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 */
return strlcpy(dst + dlen, src, n) + dlen;
}