[Pcsclite-cvs-commit] r7059 - trunk/PCSC/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2014-12-31 12:22:13 +0000 (Wed, 31 Dec 2014)
New Revision: 7059

Removed:
   trunk/PCSC/src/strlcat.c
Modified:
   trunk/PCSC/src/Makefile.am
Log:
Remove strlcat(3) copy

Since revision 7058 strlcat(3) is no more used in pcsc-lite.


Modified: trunk/PCSC/src/Makefile.am
===================================================================
--- trunk/PCSC/src/Makefile.am	2014-12-31 12:19:43 UTC (rev 7058)
+++ trunk/PCSC/src/Makefile.am	2014-12-31 12:22:13 UTC (rev 7059)
@@ -25,7 +25,6 @@
 	error.c \
 	winscard_clnt.c \
 	simclist.c \
-	strlcat.c \
 	strlcpy.c \
 	sys_unix.c \
 	utils.c \
@@ -71,7 +70,6 @@
 	sd-daemon.h \
 	simclist.c \
 	simclist.h \
-	strlcat.c \
 	strlcpy.c \
 	strlcpycat.h \
 	sys_generic.h \

Deleted: trunk/PCSC/src/strlcat.c
===================================================================
--- trunk/PCSC/src/strlcat.c	2014-12-31 12:19:43 UTC (rev 7058)
+++ trunk/PCSC/src/strlcat.c	2014-12-31 12:22:13 UTC (rev 7059)
@@ -1,63 +0,0 @@
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller at 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifndef HAVE_STRLCPY
-
-#include <sys/types.h>
-#include <string.h>
-#include "strlcpycat.h"
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(char *dst, const char *src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
-#endif