Commit 6d4e6cc8 authored by Yang Tse's avatar Yang Tse
Browse files 

Check for basename() is now done the same as other function checks
parent 86cec97b

configure.ac

+2 −17
Original line number Diff line number Diff line
@@ -2034,6 +2034,7 @@ CURL_CHECK_FUNC_SEND 
CURL_CHECK_MSG_NOSIGNAL



CURL_CHECK_FUNC_ALARM

CURL_CHECK_FUNC_BASENAME

CURL_CHECK_FUNC_CLOSESOCKET

CURL_CHECK_FUNC_CLOSESOCKET_CAMEL

CURL_CHECK_FUNC_CONNECT
@@ -2093,8 +2094,7 @@ case $host in 
    ;;

esac



AC_CHECK_FUNCS([basename \

  fork \

AC_CHECK_FUNCS([fork \

  geteuid \

  getpass_r \

  getppid \
@@ -2132,21 +2132,6 @@ AC_CHECK_FUNCS([basename \ 
  fi

])





AC_CHECK_DECL(basename, ,

              AC_DEFINE(NEED_BASENAME_PROTO, 1, [If you lack a fine basename() prototype]),

#ifdef HAVE_STRING_H

#include <string.h>

#endif

#ifdef HAVE_LIBGEN_H

#include <libgen.h>

#endif

#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

)





dnl Check if the getnameinfo function is available

dnl and get the types of five of its arguments.

CURL_CHECK_FUNC_GETNAMEINFO

lib/config-symbian.h

+0 −3
Original line number Diff line number Diff line
@@ -634,9 +634,6 @@ 
/* Define to 1 if you are building a native Windows target. */

/* #undef NATIVE_WINDOWS */



/* If you lack a fine basename() prototype */

/* #undef NEED_BASENAME_PROTO */



/* Define to 1 if you need the lber.h header file even with ldap.h */

/* #undef NEED_LBER_H */

lib/config-tpf.h

+0 −3
Original line number Diff line number Diff line
@@ -559,9 +559,6 @@ 
/* if you have the zlib.h header file */

/* #undef HAVE_ZLIB_H */



/* If you lack a fine basename() prototype */

/* #undef NEED_BASENAME_PROTO */



/* need REENTRANT defined */

/* #undef NEED_REENTRANT */

lib/config-vxworks.h

+0 −3
Original line number Diff line number Diff line
@@ -733,9 +733,6 @@ 
/* Define to 1 if you are building a native Windows target. */

/* #undef NATIVE_WINDOWS */



/* If you lack a fine basename() prototype */

/* #undef NEED_BASENAME_PROTO */



/* Define to 1 if you need the lber.h header file even with ldap.h */

/* #undef NEED_LBER_H */

lib/formdata.c

+4 −4
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ Content-Disposition: form-data; name="FILECONTENT" 


#ifndef CURL_DISABLE_HTTP



#if defined(HAVE_BASENAME) && defined(NEED_BASENAME_PROTO)

/* This system has a basename() but no prototype for it! */

char *basename(char *path);

#ifndef HAVE_BASENAME

static char *Curl_basename(char *path);

#define basename(x)  Curl_basename((x))

#endif



static size_t readfromfile(struct Form *form, char *buffer, size_t size);
@@ -1067,7 +1067,7 @@ void curl_formfree(struct curl_httppost *form) 
  required to be reentrant is not required to be thread-safe.



*/

static char *basename(char *path)

static char *Curl_basename(char *path)

{

  /* Ignore all the details above for now and make a quick and simple

     implementaion here */