Deleted Added
full compact
strlcpy.c (159644) strlcpy.c (184059)
1/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */
1/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
2
3/*
4 * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
2
3/*
4 * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
5 *
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.
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
17 *
9 *
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.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
28 */
29
17 */
18
30#if defined(LIBC_SCCS) && !defined(lint)
31static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
32#endif /* LIBC_SCCS and not lint */
33#include <sys/cdefs.h>
19#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/lib/libc/string/strlcpy.c 159644 2006-06-15 15:56:55Z maxim $");
20__FBSDID("$FreeBSD: head/lib/libc/string/strlcpy.c 184059 2008-10-19 10:11:35Z delphij $");
35
36#include <sys/types.h>
37#include <string.h>
38
39/*
40 * Copy src to string dst of size siz. At most siz-1 characters
41 * will be copied. Always NUL terminates (unless siz == 0).
42 * Returns strlen(src); if retval >= siz, truncation occurred.
43 */
44size_t
21
22#include <sys/types.h>
23#include <string.h>
24
25/*
26 * Copy src to string dst of size siz. At most siz-1 characters
27 * will be copied. Always NUL terminates (unless siz == 0).
28 * Returns strlen(src); if retval >= siz, truncation occurred.
29 */
30size_t
45strlcpy(dst, src, siz)
46 char *dst;
47 const char *src;
48 size_t siz;
31strlcpy(char *dst, const char *src, size_t siz)
49{
50 char *d = dst;
51 const char *s = src;
52 size_t n = siz;
53
54 /* Copy as many bytes as will fit */
32{
33 char *d = dst;
34 const char *s = src;
35 size_t n = siz;
36
37 /* Copy as many bytes as will fit */
55 if (n != 0 && --n != 0) {
56 do {
57 if ((*d++ = *s++) == 0)
38 if (n != 0) {
39 while (--n != 0) {
40 if ((*d++ = *s++) == '\0')
58 break;
41 break;
59 } while (--n != 0);
42 }
60 }
61
62 /* Not enough room in dst, add NUL and traverse rest of src */
63 if (n == 0) {
64 if (siz != 0)
65 *d = '\0'; /* NUL-terminate dst */
66 while (*s++)
67 ;
68 }
69
70 return(s - src - 1); /* count does not include NUL */
71}
43 }
44
45 /* Not enough room in dst, add NUL and traverse rest of src */
46 if (n == 0) {
47 if (siz != 0)
48 *d = '\0'; /* NUL-terminate dst */
49 while (*s++)
50 ;
51 }
52
53 return(s - src - 1); /* count does not include NUL */
54}