diff options
Diffstat (limited to 'firmware/common/strlcat.c')
-rw-r--r-- | firmware/common/strlcat.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/firmware/common/strlcat.c b/firmware/common/strlcat.c index 0a113dd134..da0d253e79 100644 --- a/firmware/common/strlcat.c +++ b/firmware/common/strlcat.c | |||
@@ -29,28 +29,28 @@ | |||
29 | size_t | 29 | size_t |
30 | strlcat(char *dst, const char *src, size_t siz) | 30 | strlcat(char *dst, const char *src, size_t siz) |
31 | { | 31 | { |
32 | char *d = dst; | 32 | char *d = dst; |
33 | const char *s = src; | 33 | const char *s = src; |
34 | size_t n = siz; | 34 | size_t n = siz; |
35 | size_t dlen; | 35 | size_t dlen; |
36 | 36 | ||
37 | /* Find the end of dst and adjust bytes left but don't go past end */ | 37 | /* Find the end of dst and adjust bytes left but don't go past end */ |
38 | while (n-- != 0 && *d != '\0') | 38 | while (n-- != 0 && *d != '\0') |
39 | d++; | 39 | d++; |
40 | dlen = d - dst; | 40 | dlen = d - dst; |
41 | n = siz - dlen; | 41 | n = siz - dlen; |
42 | 42 | ||
43 | if (n == 0) | 43 | if (n == 0) |
44 | return(dlen + strlen(s)); | 44 | return(dlen + strlen(s)); |
45 | while (*s != '\0') { | 45 | while (*s != '\0') { |
46 | if (n != 1) { | 46 | if (n != 1) { |
47 | *d++ = *s; | 47 | *d++ = *s; |
48 | n--; | 48 | n--; |
49 | } | 49 | } |
50 | s++; | 50 | s++; |
51 | } | 51 | } |
52 | *d = '\0'; | 52 | *d = '\0'; |
53 | 53 | ||
54 | return(dlen + (s - src)); /* count does not include NUL */ | 54 | return(dlen + (s - src)); /* count does not include NUL */ |
55 | } | 55 | } |
56 | 56 | ||