diff options
| author | Damien Miller <djm@mindrot.org> | 2001-06-28 14:48:28 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-06-28 14:48:28 +1000 |
| commit | 180207ffe1a54bb15d10ce54fdc854b8dcd0511f (patch) | |
| tree | cb5a7d07cd28ff08c26f163112d33b7ded283ff6 /openbsd-compat/strlcat.c | |
| parent | 315f8b70b0e255fd7c2222794631d233569ce22b (diff) | |
- (djm) Sync openbsd-compat with -current libc
Diffstat (limited to 'openbsd-compat/strlcat.c')
| -rw-r--r-- | openbsd-compat/strlcat.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c index d80739fc..6ff65c19 100644 --- a/openbsd-compat/strlcat.c +++ b/openbsd-compat/strlcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcat.c,v 1.5 2001/01/13 16:17:24 millert Exp $ */ +/* $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -31,7 +31,7 @@ #ifndef HAVE_STRLCAT #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.5 2001/01/13 16:17:24 millert Exp $"; +static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -42,10 +42,11 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.5 2001/01/13 16:17:24 millert Exp * Appends src to string dst of size siz (unlike strncat, siz is the * full size of dst, not space left). At most siz-1 characters * will be copied. Always NUL terminates (unless siz <= strlen(dst)). - * Returns strlen(initial dst) + strlen(src); if retval >= siz, - * truncation occurred. + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. */ -size_t strlcat(dst, src, siz) +size_t +strlcat(dst, src, siz) char *dst; const char *src; size_t siz; |