Commit 7aede6a9 authored by Igor Gnatenko's avatar Igor Gnatenko Committed by Guillem Jover

Make strlcpy()/strlcat() slightly easier to read

Backport new changes from OpenBSD.

[guillem@hadrons.org:
 - Update copyright years in COPYING. ]

References: https://svnweb.freebsd.org/base?view=revision&revision=281135Signed-off-by: Igor Gnatenko's avatarIgor Gnatenko <i.gnatenko.brain@gmail.com>
Signed-off-by: Guillem Jover's avatarGuillem Jover <guillem@hadrons.org>
parent ab5db68b
...@@ -414,7 +414,7 @@ Copyright: ...@@ -414,7 +414,7 @@ Copyright:
All rights reserved. All rights reserved.
. .
Copyright © 1996 David Mazieres <dm@uun.org> Copyright © 1996 David Mazieres <dm@uun.org>
Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2014 Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2015
Todd C. Miller <Todd.Miller@courtesan.com> Todd C. Miller <Todd.Miller@courtesan.com>
Copyright © 2004 Ted Unangst Copyright © 2004 Ted Unangst
Copyright © 2008 Damien Miller <djm@openbsd.org> Copyright © 2008 Damien Miller <djm@openbsd.org>
......
/* $OpenBSD: strlcat.c,v 1.12 2005/03/30 20:13:52 otto Exp $ */ /* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */
/* /*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
...@@ -20,36 +20,36 @@ ...@@ -20,36 +20,36 @@
#include <string.h> #include <string.h>
/* /*
* Appends src to string dst of size siz (unlike strncat, siz is the * Appends src to string dst of size dsize (unlike strncat, dsize is the
* full size of dst, not space left). At most siz-1 characters * full size of dst, not space left). At most dsize-1 characters
* will be copied. Always NUL terminates (unless siz <= strlen(dst)). * will be copied. Always NUL terminates (unless dsize <= strlen(dst)).
* Returns strlen(src) + MIN(siz, strlen(initial dst)). * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
* If retval >= siz, truncation occurred. * If retval >= dsize, truncation occurred.
*/ */
size_t size_t
strlcat(char *dst, const char *src, size_t siz) strlcat(char *dst, const char *src, size_t dsize)
{ {
char *d = dst; const char *odst = dst;
const char *s = src; const char *osrc = src;
size_t n = siz; size_t n = dsize;
size_t dlen; size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */ /* Find the end of dst and adjust bytes left but don't go past end. */
while (n-- != 0 && *d != '\0') while (n-- != 0 && *dst != '\0')
d++; dst++;
dlen = d - dst; dlen = dst - odst;
n = siz - dlen; n = dsize - dlen;
if (n == 0) if (n-- == 0)
return(dlen + strlen(s)); return(dlen + strlen(src));
while (*s != '\0') { while (*src != '\0') {
if (n != 1) { if (n != 0) {
*d++ = *s; *dst++ = *src;
n--; n--;
} }
s++; src++;
} }
*d = '\0'; *dst = '\0';
return(dlen + (s - src)); /* count does not include NUL */ return(dlen + (src - osrc)); /* count does not include NUL */
} }
/* $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */ /* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */
/* /*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
...@@ -20,32 +20,31 @@ ...@@ -20,32 +20,31 @@
#include <string.h> #include <string.h>
/* /*
* Copy src to string dst of size siz. At most siz-1 characters * Copy string src to buffer dst of size dsize. At most dsize-1
* will be copied. Always NUL terminates (unless siz == 0). * chars will be copied. Always NUL terminates (unless dsize == 0).
* Returns strlen(src); if retval >= siz, truncation occurred. * Returns strlen(src); if retval >= dsize, truncation occurred.
*/ */
size_t size_t
strlcpy(char *dst, const char *src, size_t siz) strlcpy(char *dst, const char *src, size_t dsize)
{ {
char *d = dst; const char *osrc = src;
const char *s = src; size_t nleft = dsize;
size_t n = siz;
/* Copy as many bytes as will fit */ /* Copy as many bytes as will fit. */
if (n != 0) { if (nleft != 0) {
while (--n != 0) { while (--nleft != 0) {
if ((*d++ = *s++) == '\0') if ((*dst++ = *src++) == '\0')
break; break;
} }
} }
/* Not enough room in dst, add NUL and traverse rest of src */ /* Not enough room in dst, add NUL and traverse rest of src. */
if (n == 0) { if (nleft == 0) {
if (siz != 0) if (dsize != 0)
*d = '\0'; /* NUL-terminate dst */ *dst = '\0'; /* NUL-terminate dst */
while (*s++) while (*src++)
; ;
} }
return(s - src - 1); /* count does not include NUL */ return(src - osrc - 1); /* count does not include NUL */
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment