| 6 |
|
*/ |
| 7 |
|
|
| 8 |
|
#include "copyright.h" |
| 9 |
+ |
#include "rtio.h" |
| 10 |
|
|
| 11 |
< |
int |
| 12 |
< |
strlcpy(char *dst, const char *src, int siz) |
| 11 |
> |
size_t |
| 12 |
> |
strlcpy(char *dst, const char *src, size_t siz) |
| 13 |
|
{ |
| 14 |
< |
int n = siz; |
| 14 |
> |
size_t n = siz; |
| 15 |
|
|
| 16 |
|
while (--n > 0) |
| 17 |
|
if (!(*dst++ = *src++)) |
| 18 |
|
return(siz-1-n); |
| 19 |
|
*dst = '\0'; |
| 20 |
+ |
while (*src++) |
| 21 |
+ |
++siz; |
| 22 |
|
return(siz-1); |
| 23 |
|
} |
| 24 |
|
|
| 25 |
< |
int |
| 26 |
< |
strlcat(char *dst, const char *src, int siz) |
| 25 |
> |
size_t |
| 26 |
> |
strlcat(char *dst, const char *src, size_t siz) |
| 27 |
|
{ |
| 28 |
< |
int n = siz; |
| 28 |
> |
size_t n = siz; |
| 29 |
|
|
| 30 |
|
while (*dst && --n > 0) |
| 31 |
|
++dst; |
| 32 |
|
if (n <= 0) |
| 33 |
< |
return(siz); |
| 33 |
> |
return(siz+strlen(src)); |
| 34 |
|
return(siz-n + strlcpy(dst, src, n)); |
| 35 |
|
} |
