Add changes in 4.2.1.

[tcpdump] / missing / strlcpy.c

diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 76f58bbf54b9e6066d568a9cd835ac56f4779d9a..a92e4d130bb9dda2201d7b477c8f59faaa7eacb8 100644 (file)
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -29,16 +29,17 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.1 2000-01-19 05:34:19 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.5 2003-11-16 09:36:52 guy Exp $ (LBL)";

 #endif
 
 #endif
 

+#ifdef HAVE_CONFIG_H 

 #include <config.h>
 #include <config.h>

+#endif

 
 

-#include <sys/types.h>
-#include <string.h>
+#include <tcpdump-stdinc.h>

 
 

-#include "interface.h"
+#include <string.h>

 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters


@@ -46,10 +47,7 @@ static const char rcsid[] =
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 size_t
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 size_t

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

 {
        register char *d = dst;
        register const char *s = src;
 {
        register char *d = dst;
        register const char *s = src;