Commit 358c5c07 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

strlcat: remove function 

This function was only used twice, both in places where performance
isn't crucial (socks + if2ip). Removing the use of this function removes
the need to have our private version for systems without it == reduced
amount of code.

Also, in the SOCKS case it is clearly better to fail gracefully rather
than to truncate the results.

This work was triggered by a bug report on the strcal prototype in
strequal.h.

strlcat was added in commit db70cd28 in February 2001!

Bug: http://curl.haxx.se/bug/view.cgi?id=1192
Reported by: Jeremy Huddleston
parent d821525c

configure.ac

+0 −1
Original line number Diff line number Diff line
@@ -3044,7 +3044,6 @@ CURL_CHECK_FUNC_STRCMPI 
CURL_CHECK_FUNC_STRDUP

CURL_CHECK_FUNC_STRERROR_R

CURL_CHECK_FUNC_STRICMP

CURL_CHECK_FUNC_STRLCAT

CURL_CHECK_FUNC_STRNCASECMP

CURL_CHECK_FUNC_STRNCMPI

CURL_CHECK_FUNC_STRNICMP

lib/config-dos.h

+1 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -164,10 +164,6 @@ 
  #define HAVE_SYS_TIME_H 1

  #define HAVE_VARIADIC_MACROS_GCC 1



  #if (DJGPP_MINOR >= 4)

    #define HAVE_STRLCAT  1

  #endif



  /* Because djgpp <= 2.03 doesn't have snprintf() etc. */

  #if (DJGPP_MINOR < 4)

    #define _MPRINTF_REPLACE

lib/config-os400.h

+1 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -298,9 +298,6 @@ 
/* Define if you have the <string.h> header file. */

#define HAVE_STRING_H



/* Define if you have the `strlcat' function. */

#undef HAVE_STRLCAT



/* Define if you have the `strlcpy' function. */

#undef HAVE_STRLCPY

lib/config-riscos.h

+1 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -305,9 +305,6 @@ 
/* Define if you have the <string.h> header file. */

#define HAVE_STRING_H



/* Define if you have the `strlcat' function. */

#undef HAVE_STRLCAT



/* Define if you have the `strlcpy' function. */

#undef HAVE_STRLCPY

lib/config-symbian.h

+1 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -525,9 +525,6 @@ 
/* Define to 1 if you have the <string.h> header file. */

#define HAVE_STRING_H 1



/* Define to 1 if you have the `strlcat' function. */

#define HAVE_STRLCAT 1



/* Define to 1 if you have the `strlcpy' function. */

#define HAVE_STRLCPY 1