From 6c5f4beb53d5e37fefe017cf28c513c44cfda1af Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Tue, 18 Jan 2005 09:05:37 +0000 Subject: Fixed return values of our own implementation of strlcpy(). The code has been taken from rsync and they fixed it, but we didn't until today :-/ --- src/portab/strlcpy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/portab/strlcpy.c b/src/portab/strlcpy.c index f77527a0..627b3218 100644 --- a/src/portab/strlcpy.c +++ b/src/portab/strlcpy.c @@ -19,7 +19,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: strlcpy.c,v 1.2 2002/12/26 14:34:11 alex Exp $"; +static char UNUSED id[] = "$Id: strlcpy.c,v 1.3 2005/01/18 09:05:37 alex Exp $"; #include "imp.h" #include @@ -61,12 +61,13 @@ strlcpy( CHAR *dst, CONST CHAR *src, size_t size ) * always null terminates. */ size_t len = strlen( src ); + size_t ret = len; - if( size <= 0 ) return len; + if( size <= 0 ) return 0; if( len >= size ) len = size - 1; memcpy( dst, src, len ); dst[len] = 0; - return len; + return ret; } /* strlcpy */ #endif -- cgit 1.4.1