mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync strlcpy/strlcat from OpenBSD

Browse source
This commit is contained in:
sin 2015-11-20 14:12:47 +00:00
parent 9b47bfd9aa
commit ebaa637b0b
2 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
strlcat.c
View file

@ -1,5 +1,5 @@
/* /*
* 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,33 +20,36 @@
#include "util.h" #include "util.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 */
while (n-- != 0 && *d != '\0') /* Find the end of dst and adjust bytes left but don't go past end. */
d++; while (n-- != 0 && *dst != '\0')
dlen = d - dst; dst++;
n = siz - dlen; dlen = dst - odst;
if (n == 0) n = dsize - dlen;
return(dlen + strlen(s));
while (*s != '\0') { if (n-- == 0)
if (n != 1) { return(dlen + strlen(src));
*d++ = *s; while (*src != '\0') {
if (n != 0) {
*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 */
} }

39
strlcpy.c
View file

@ -1,5 +1,5 @@
/* /*
* 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
@ -16,32 +16,35 @@
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
#include "util.h" #include "util.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 */
if (n == 0) { /* Not enough room in dst, add NUL and traverse rest of src. */
if (siz != 0) if (nleft == 0) {
*d = '\0'; /* NUL-terminate dst */ if (dsize != 0)
while (*s++) *dst = '\0'; /* NUL-terminate dst */
while (*src++)
; ;
} }
return(s - src - 1); /* count does not include NUL */
return(src - osrc - 1); /* count does not include NUL */
} }