fatbase

portable OpenBSD tools
git clone git://git.2f30.org/fatbase.git
Log | Files | Refs

commit ed6bca274113f13a9cf5fe5dff12947d3f948399
parent 1b3d71c6e6cbd4cb308d0ce5f2b5452e1df78cf6
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri Nov 21 22:03:34 +0100

yacc: improve build

Diffstat:
yacc/Makefile | 26+++++++++-----------------
yacc/strlcpy.c | 48++++++++++++++++++++++++++++++++++++++++++++++++
yacc/util.h | 2++
3 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/yacc/Makefile b/yacc/Makefile @@ -1,19 +1,11 @@ -build: clean - cc -c *.c - cc -o yacc *.o +OBJ = closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \ + skeleton.o symtab.o verbose.o warshall.o reallocarray.o strlcpy.o +TARG = yacc +LDLIBS = -clean: - rm -f *.o yacc +all: $(TARG) + +include ../std.mk -# $OpenBSD: Makefile,v 1.5 2010/10/17 22:54:37 schwarze Exp $ -# -#PROG= yacc -#SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \ -# skeleton.c symtab.c verbose.c warshall.c -#MAN= yacc.1 yyfix.1 -# -#beforeinstall: -# ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ -# ${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix -# -#.include <bsd.prog.mk> +clean: + rm -f $(TARG) $(OBJ) diff --git a/yacc/strlcpy.c b/yacc/strlcpy.c @@ -0,0 +1,48 @@ +/* + * Copyright (c) 1998 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 <string.h> +#include <sys/types.h> + +#include "util.h" + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + return(s - src - 1); /* count does not include NUL */ +} diff --git a/yacc/util.h b/yacc/util.h @@ -1,3 +1,5 @@ #include <sys/stat.h> void *reallocarray(void *, size_t, size_t); + +size_t strlcpy(char *, const char *, size_t);