stagit-gopher

static git page generator for gopher
git clone git://git.2f30.org/stagit-gopher.git
Log | Files | Refs | README | LICENSE

commit e95a7d9de8805d9264b1d7cdcf43f15d2ec6b49c
parent 4cf1bb0b9aa14b598a4c3cff171f7601fd6730ee
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Wed Jun 14 18:24:28 +0200

remove strlcat, it is unused now

Diffstat:
Makefile | 2--
compat.h | 2--
strlcat.c | 57---------------------------------------------------------
3 files changed, 0 insertions(+), 61 deletions(-)
diff --git a/Makefile b/Makefile @@ -7,7 +7,6 @@ SRC = \ stagit-index.c COMPATSRC = \ reallocarray.c\ - strlcat.c\ strlcpy.c BIN = \ stagit\ @@ -23,7 +22,6 @@ HDR = compat.h COMPATOBJ = \ reallocarray.o\ - strlcat.o\ strlcpy.o OBJ = ${SRC:.c=.o} ${COMPATOBJ} diff --git a/compat.h b/compat.h @@ -1,5 +1,3 @@ -#undef strlcat -size_t strlcat(char *, const char *, size_t); #undef strlcpy size_t strlcpy(char *, const char *, size_t); #undef reallocarray diff --git a/strlcat.c b/strlcat.c @@ -1,57 +0,0 @@ -/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */ - -/* - * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <string.h> - -#include "compat.h" - -/* - * Appends src to string dst of size dsize (unlike strncat, dsize is the - * full size of dst, not space left). At most dsize-1 characters - * will be copied. Always NUL terminates (unless dsize <= strlen(dst)). - * Returns strlen(src) + MIN(dsize, strlen(initial dst)). - * If retval >= dsize, truncation occurred. - */ -size_t -strlcat(char *dst, const char *src, size_t dsize) -{ - const char *odst = dst; - const char *osrc = src; - size_t n = dsize; - size_t dlen; - - /* Find the end of dst and adjust bytes left but don't go past end. */ - while (n-- != 0 && *dst != '\0') - dst++; - dlen = dst - odst; - n = dsize - dlen; - - if (n-- == 0) - return(dlen + strlen(src)); - while (*src != '\0') { - if (n != 0) { - *dst++ = *src; - n--; - } - src++; - } - *dst = '\0'; - - return(dlen + (src - osrc)); /* count does not include NUL */ -}