diff --git a/lib/roken/strlcat.c b/lib/roken/strlcat.c index 019c638a7..4b68aa2c2 100644 --- a/lib/roken/strlcat.c +++ b/lib/roken/strlcat.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -43,12 +43,12 @@ RCSID("$Id$"); -#ifndef HAVE_STRCAT_TRUNCATE +#ifndef HAVE_STRLCAT -int -strcat_truncate (char *dst, const char *src, size_t dst_sz) +size_t +strlcat (char *dst, const char *src, size_t dst_sz) { - int len = strlen(dst); + size_t len = strlen(dst); return len + strcpy_truncate (dst + len, src, dst_sz - len); } diff --git a/lib/roken/strlcpy.c b/lib/roken/strlcpy.c index 26590376b..528683702 100644 --- a/lib/roken/strlcpy.c +++ b/lib/roken/strlcpy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -43,12 +43,12 @@ RCSID("$Id$"); -#ifndef HAVE_STRCPY_TRUNCATE +#ifndef HAVE_STRLCPY -int -strcpy_truncate (char *dst, const char *src, size_t dst_sz) +size_t +strlcpy (char *dst, const char *src, size_t dst_sz) { - int n; + size_t n; char *p; for (p = dst, n = 0;