[Pcsclite-cvs-commit] CVS PCSC/src
CVS User rousseau
ludovic.rousseau@free.fr
Wed, 23 Feb 2005 07:31:58 -0700
Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv28946/src
Modified Files:
Makefile.am strlcat.c strlcpy.c
Log Message:
simplify the detection and use of strlcpy and strlcat
--- /cvsroot/pcsclite/PCSC/src/Makefile.am 2004/10/04 14:11:25 1.45
+++ /cvsroot/pcsclite/PCSC/src/Makefile.am 2005/02/23 14:31:58 1.46
@@ -23,14 +23,6 @@
PCSC_CLIENT_SRC = winscard_clnt.c
endif
-if NEED_STRLCPY
-STRLCPY=strlcpy.c
-endif
-
-if NEED_STRLCAT
-STRLCAT=strlcat.c
-endif
-
libpcsclite_core_la_SOURCES = \
atrhandler.c \
configfile.l \
@@ -47,8 +39,7 @@
$(PCSC_DYNLOAD_SRC) \
$(PCSC_HOTPLUG_SRC) \
$(PCSC_POWERMGT_SRC) \
- $(STRLCPY) \
- $(STRLCAT)
+ strlcpy.c strlcat.c
libpcsclite_core_la_CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
libpcsclite_la_SOURCES = \
@@ -59,8 +50,7 @@
$(PCSC_SYSTEM_SRC) \
$(PCSC_THREAD_SRC) \
$(PCSC_DYNLOAD_SRC) \
- $(STRLCPY) \
- $(STRLCAT)
+ strlcpy.c strlcat.c
libpcsclite_la_LDFLAGS = -version-info 1:0:0
libpcsclite_la_LIBADD = @COREFOUNDATION@ @LIBSMARTCARD@ @LIBDL@
--- /cvsroot/pcsclite/PCSC/src/strlcat.c 2004/09/07 08:34:19 1.1
+++ /cvsroot/pcsclite/PCSC/src/strlcat.c 2005/02/23 14:31:58 1.2
@@ -16,6 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+#ifndef HAVE_STRLCAT
+
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $";
#endif /* LIBC_SCCS and not lint */
@@ -57,3 +60,6 @@
return(dlen + (s - src)); /* count does not include NUL */
}
+
+#endif
+
--- /cvsroot/pcsclite/PCSC/src/strlcpy.c 2004/09/07 08:34:19 1.1
+++ /cvsroot/pcsclite/PCSC/src/strlcpy.c 2005/02/23 14:31:58 1.2
@@ -16,6 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+#ifndef HAVE_STRLCPY
+
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $";
#endif /* LIBC_SCCS and not lint */
@@ -53,3 +56,6 @@
return(s - src - 1); /* count does not include NUL */
}
+
+#endif
+