summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-25 17:13:20 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-25 17:13:20 +0000
commitc6290a8d4b6dcb3aa06779286670da4fe2d4fb1f (patch)
treea41aef688493595a3e261f71b3e0358a3bc7b506 /osdep
parentf36cc4c21b461f68cbf7a1c4bb4e3e8d7110d37d (diff)
downloadmpv-c6290a8d4b6dcb3aa06779286670da4fe2d4fb1f.tar.bz2
mpv-c6290a8d4b6dcb3aa06779286670da4fe2d4fb1f.tar.xz
fix broken (off-by-one) behavior of our strl* functions (patch by reimar)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16854 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/strl.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/osdep/strl.c b/osdep/strl.c
index 8c0949a889..664ab7905c 100644
--- a/osdep/strl.c
+++ b/osdep/strl.c
@@ -11,10 +11,14 @@ unsigned int strlcpy (char *dest, const char *src, unsigned int size)
{
register unsigned int i;
+ if (size > 0) {
+ size--;
for (i=0; size > 0 && src[i] != '\0'; ++i, size--)
dest[i] = src[i];
dest[i] = '\0';
+ }
+ while (src[i++]);
return i;
}
@@ -23,26 +27,10 @@ unsigned int strlcpy (char *dest, const char *src, unsigned int size)
#ifndef HAVE_STRLCAT
unsigned int strlcat (char *dest, const char *src, unsigned int size)
{
-#if 0
- register unsigned int i, j;
-
- for(i=0; size > 0 && dest[i] != '\0'; size--, i++);
- for(j=0; size > 0 && src[j] != '\0'; size--, i++, j++)
- dest[i] = src[j];
-
- dest[i] = '\0';
- return i;
-#else
register char *d = dest;
- register const char *s = src;
for (; size > 0 && *d != '\0'; size--, d++);
- for (; size > 0 && *s != '\0'; size--, d++, s++)
- *d = *s;
-
- *d = '\0';
- return (d - dest) + (s - src);
-#endif
+ return (d - dest) + strlcpy(d, src, size);
}
#endif