~arivigo/minitimer

f50304bee921307e6d59aabc378743133c63bea0 — Ariadna Vigo 10 months ago f659db1
strlcpy.c/h: rm as no longer in use
4 files changed, 4 insertions(+), 57 deletions(-)

M Makefile
M minitimer.c
D strlcpy.c
D strlcpy.h
M Makefile => Makefile +4 -4
@@ 4,7 4,7 @@

include config.mk

SRC = minitimer.c strlcpy.c
SRC = minitimer.c
OBJ = ${SRC:%.c=%.o}

all: options minitimer


@@ 20,7 20,7 @@ options:
config.h:
	cp config.def.h $@

minitimer.o: config.h strlcpy.h
minitimer.o: config.h

${OBJ}: config.mk



@@ 32,8 32,8 @@ clean:

dist: clean
	mkdir -p minitimer-${VERSION}
	cp -R LICENSE Makefile README.md config.def.h strlcpy.h config.mk \
	   minitimer.1 ${SRC} minitimer-${VERSION}
	cp -R LICENSE Makefile README.md config.def.h config.mk minitimer.1 \
	   ${SRC} minitimer-${VERSION}
	tar -cf minitimer-${VERSION}.tar minitimer-${VERSION}
	gzip minitimer-${VERSION}.tar
	rm -rf minitimer-${VERSION}

M minitimer.c => minitimer.c +0 -1
@@ 13,7 13,6 @@
#include <unistd.h>

#include "config.h"
#include "strlcpy.h"

#define FILENAME_SIZE 64


D strlcpy.c => strlcpy.c +0 -49
@@ 1,49 0,0 @@
/*
 * 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 "strlcpy.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 */
}


D strlcpy.h => strlcpy.h +0 -3
@@ 1,3 0,0 @@
/* See LICENSE file for copyright and license details. */

size_t strlcpy(char *dst, const char *src, size_t siz);