Skip to content

Fix strlcpy to match definition in Apple's updated fork #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SiliconA-Z wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix strlcpy to match definition in Apple's updated fork #920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/shims.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
#if !HAVE_STRLCPY
size_t strlcpy(char *dst, const char *src, size_t size)
{
size_t res = strlen(dst) + strlen(src) + 1;
if (size > 0) {
size_t n = size - 1;
strncpy(dst, src, n);
dst[n] = 0;
size_t srclen = strlen(src);
if (srclen < size) {
strncpy(dst, src, srclen + 1);
} else if (size > 0) {
strncpy(dst, src, size-1);
dst[size-1] = '\0';
}
return res;
return srclen;
}
#endif