make the logic simpler, and handle dst_sz == 0
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11146 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995 - 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1995-2002 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -44,16 +44,16 @@ size_t
|
||||
strlcpy (char *dst, const char *src, size_t dst_sz)
|
||||
{
|
||||
size_t n;
|
||||
char *p;
|
||||
|
||||
for (p = dst, n = 0;
|
||||
n + 1 < dst_sz && *src != '\0';
|
||||
++p, ++src, ++n)
|
||||
*p = *src;
|
||||
*p = '\0';
|
||||
if (*src == '\0')
|
||||
for (n = 0; n < dst_sz; n++) {
|
||||
if ((*dst++ = *src++) == '\0')
|
||||
break;
|
||||
}
|
||||
|
||||
if (n < dst_sz)
|
||||
return n;
|
||||
else
|
||||
if (n > 0)
|
||||
*(dst - 1) = '\0';
|
||||
return n + strlen (src);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user