Deleted Added
full compact
strlcat.c (80274) strlcat.c (86170)
1/* $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */
2
3/*
4 * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. The name of the author may not be used to endorse or promote products
16 * derived from this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
19 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
20 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
21 * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#if defined(LIBC_SCCS) && !defined(lint)
1/* $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */
2
3/*
4 * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. The name of the author may not be used to endorse or promote products
16 * derived from this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
19 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
20 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
21 * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
24 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
25 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#if defined(LIBC_SCCS) && !defined(lint)
31static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
31static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $");
32#endif /* LIBC_SCCS and not lint */
32#endif /* LIBC_SCCS and not lint */
33#ifndef lint
34static const char rcsid[] =
35 "$FreeBSD: head/sys/libkern/strlcat.c 80274 2001-07-24 11:34:22Z kris $";
36#endif
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/libkern/strlcat.c 86170 2001-11-07 19:55:16Z obrien $");
37
38#include <sys/types.h>
39#include <string.h>
40
41/*
42 * Appends src to string dst of size siz (unlike strncat, siz is the
43 * full size of dst, not space left). At most siz-1 characters
44 * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
45 * Returns strlen(src) + MIN(siz, strlen(initial dst)).
46 * If retval >= siz, truncation occurred.
47 */
48size_t
49strlcat(dst, src, siz)
50 char *dst;
51 const char *src;
52 size_t siz;
53{
54 register char *d = dst;
55 register const char *s = src;
56 register size_t n = siz;
57 size_t dlen;
58
59 /* Find the end of dst and adjust bytes left but don't go past end */
60 while (n-- != 0 && *d != '\0')
61 d++;
62 dlen = d - dst;
63 n = siz - dlen;
64
65 if (n == 0)
66 return(dlen + strlen(s));
67 while (*s != '\0') {
68 if (n != 1) {
69 *d++ = *s;
70 n--;
71 }
72 s++;
73 }
74 *d = '\0';
75
76 return(dlen + (s - src)); /* count does not include NUL */
77}
35
36#include <sys/types.h>
37#include <string.h>
38
39/*
40 * Appends src to string dst of size siz (unlike strncat, siz is the
41 * full size of dst, not space left). At most siz-1 characters
42 * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
43 * Returns strlen(src) + MIN(siz, strlen(initial dst)).
44 * If retval >= siz, truncation occurred.
45 */
46size_t
47strlcat(dst, src, siz)
48 char *dst;
49 const char *src;
50 size_t siz;
51{
52 register char *d = dst;
53 register const char *s = src;
54 register size_t n = siz;
55 size_t dlen;
56
57 /* Find the end of dst and adjust bytes left but don't go past end */
58 while (n-- != 0 && *d != '\0')
59 d++;
60 dlen = d - dst;
61 n = siz - dlen;
62
63 if (n == 0)
64 return(dlen + strlen(s));
65 while (*s != '\0') {
66 if (n != 1) {
67 *d++ = *s;
68 n--;
69 }
70 s++;
71 }
72 *d = '\0';
73
74 return(dlen + (s - src)); /* count does not include NUL */
75}