diff --git a/libdnet-stripped/acconfig.h b/libdnet-stripped/acconfig.h index bc30a6047..8c7ce610a 100644 --- a/libdnet-stripped/acconfig.h +++ b/libdnet-stripped/acconfig.h @@ -19,10 +19,6 @@ int inet_pton(int, const char *, void *); #endif -#ifndef HAVE_STRLCAT -int strlcat(char *, const char *, int); -#endif - #ifndef HAVE_STRLCPY int strlcpy(char *, const char *, int); #endif diff --git a/libdnet-stripped/configure b/libdnet-stripped/configure index 7198b56a1..cf8959967 100755 --- a/libdnet-stripped/configure +++ b/libdnet-stripped/configure @@ -870,6 +870,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -951,6 +952,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1203,6 +1205,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1340,7 +1351,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1493,6 +1504,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4629,13 +4641,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4632: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4644: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4635: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4647: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4638: output\"" >&5) + (eval echo "\"\$as_me:4650: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5841,7 +5853,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5844 "configure"' > conftest.$ac_ext + echo '#line 5856 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7334,11 +7346,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7337: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7349: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7341: \$? = $ac_status" >&5 + echo "$as_me:7353: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7673,11 +7685,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7676: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7688: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7680: \$? = $ac_status" >&5 + echo "$as_me:7692: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7778,11 +7790,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7793: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7785: \$? = $ac_status" >&5 + echo "$as_me:7797: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7833,11 +7845,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7836: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7848: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7840: \$? = $ac_status" >&5 + echo "$as_me:7852: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10200,7 +10212,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10203 "configure" +#line 10215 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10296,7 +10308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10299 "configure" +#line 10311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11339,9 +11351,6 @@ done for ac_header in net/route.h do : ac_fn_c_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " -#ifdef HAVE_SYS_TYPES_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -11781,19 +11790,6 @@ esac fi -ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" -if test "x$ac_cv_func_strlcat" = xyes; then : - $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strlcat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strlcat.$ac_objext" - ;; -esac - -fi - ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" if test "x$ac_cv_func_strlcpy" = xyes; then : $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h diff --git a/libdnet-stripped/configure.in b/libdnet-stripped/configure.in index d815b62d2..95abd53f8 100644 --- a/libdnet-stripped/configure.in +++ b/libdnet-stripped/configure.in @@ -207,7 +207,7 @@ AC_CHECK_TYPES([socklen_t], [], [], [AC_INCLUDES_DEFAULT dnl Checks for library functions. AC_FUNC_MEMCMP -AC_REPLACE_FUNCS(err strlcat strlcpy strsep) +AC_REPLACE_FUNCS(err strlcpy strsep) dnl Checks for other system-specific jonks. if test "$CYGWIN" != yes ; then diff --git a/libdnet-stripped/include/config.h.in b/libdnet-stripped/include/config.h.in index 5889f59d4..67ba3ee4d 100644 --- a/libdnet-stripped/include/config.h.in +++ b/libdnet-stripped/include/config.h.in @@ -169,9 +169,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - /* Define to 1 if you have the `strlcpy' function. */ #undef HAVE_STRLCPY @@ -294,10 +291,6 @@ int inet_pton(int, const char *, void *); #endif -#ifndef HAVE_STRLCAT -size_t strlcat(char *, const char *, int); -#endif - #ifndef HAVE_STRLCPY size_t strlcpy(char *, const char *, int); #endif diff --git a/libdnet-stripped/include/dnet_winconfig.h b/libdnet-stripped/include/dnet_winconfig.h index e41907c2a..f0b2310e3 100644 --- a/libdnet-stripped/include/dnet_winconfig.h +++ b/libdnet-stripped/include/dnet_winconfig.h @@ -164,9 +164,6 @@ /* Define if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the `strlcat' function. */ -/* #undef HAVE_STRLCAT */ - /* Define if you have the `strlcpy' function. */ /* #undef HAVE_STRLCPY */ @@ -265,10 +262,6 @@ # define _SOCKADDR_LEN 1 #endif -#ifndef HAVE_STRLCAT -int strlcat(char *, const char *, int); -#endif - #ifndef HAVE_STRLCPY int strlcpy(char *, const char *, int); #endif diff --git a/libdnet-stripped/libdnet-stripped.vcxproj b/libdnet-stripped/libdnet-stripped.vcxproj index 6a97de231..77c1c3857 100755 --- a/libdnet-stripped/libdnet-stripped.vcxproj +++ b/libdnet-stripped/libdnet-stripped.vcxproj @@ -89,7 +89,6 @@ - diff --git a/libdnet-stripped/src/Makefile.in b/libdnet-stripped/src/Makefile.in index f2f5be219..16880e31e 100644 --- a/libdnet-stripped/src/Makefile.in +++ b/libdnet-stripped/src/Makefile.in @@ -38,7 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ eth-ndd.c eth-none.c eth-pfilt.c eth-snoop.c eth-win32.c \ fw-none.c intf-win32.c intf.c ip-cooked.c ip-win32.c ip.c \ memcmp.c route-bsd.c route-hpux.c route-linux.c route-none.c \ - route-win32.c strlcat.c strlcpy.c strsep.c tun-bsd.c \ + route-win32.c strlcpy.c strsep.c tun-bsd.c \ tun-linux.c tun-none.c tun-solaris.c subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/libdnet-stripped/src/strlcat.c b/libdnet-stripped/src/strlcat.c deleted file mode 100644 index b30964815..000000000 --- a/libdnet-stripped/src/strlcat.c +++ /dev/null @@ -1,73 +0,0 @@ -/* $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $ */ - -/* - * Copyright (c) 1998 Todd C. Miller - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -/* - * 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(dst, src, siz) - char *dst; - const char *src; - size_t siz; -{ - register char *d = dst; - register const char *s = src; - register 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 */ -}