+++ /dev/null
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-ac_cv_c_const=${ac_cv_c_const='yes'}
-ac_cv_func_closesocket=${ac_cv_func_closesocket='no'}
-ac_cv_func_connect=${ac_cv_func_connect='no'}
-ac_cv_func_dlopen=${ac_cv_func_dlopen='no'}
-ac_cv_func_gethostbyaddr=${ac_cv_func_gethostbyaddr='yes'}
-ac_cv_func_gethostbyname=${ac_cv_func_gethostbyname='no'}
-ac_cv_func_gethostname=${ac_cv_func_gethostname='yes'}
-ac_cv_func_getpass=${ac_cv_func_getpass='yes'}
-ac_cv_func_getservbyname=${ac_cv_func_getservbyname='yes'}
-ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday='yes'}
-ac_cv_func_inet_addr=${ac_cv_func_inet_addr='yes'}
-ac_cv_func_inet_ntoa=${ac_cv_func_inet_ntoa='yes'}
-ac_cv_func_perror=${ac_cv_func_perror='yes'}
-ac_cv_func_select=${ac_cv_func_select='yes'}
-ac_cv_func_socket=${ac_cv_func_socket='yes'}
-ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp='yes'}
-ac_cv_func_strdup=${ac_cv_func_strdup='yes'}
-ac_cv_func_strftime=${ac_cv_func_strftime='yes'}
-ac_cv_func_strstr=${ac_cv_func_strstr='yes'}
-ac_cv_func_tcgetattr=${ac_cv_func_tcgetattr='yes'}
-ac_cv_func_tcsetattr=${ac_cv_func_tcsetattr='yes'}
-ac_cv_func_uname=${ac_cv_func_uname='yes'}
-ac_cv_func_vprintf=${ac_cv_func_vprintf='yes'}
-ac_cv_header_alloca_h=${ac_cv_header_alloca_h='yes'}
-ac_cv_header_arpa_inet_h=${ac_cv_header_arpa_inet_h='yes'}
-ac_cv_header_dlfcn_h=${ac_cv_header_dlfcn_h='yes'}
-ac_cv_header_fcntl_h=${ac_cv_header_fcntl_h='yes'}
-ac_cv_header_getopt_h=${ac_cv_header_getopt_h='no'}
-ac_cv_header_io_h=${ac_cv_header_io_h='no'}
-ac_cv_header_net_if_h=${ac_cv_header_net_if_h='yes'}
-ac_cv_header_netdb_h=${ac_cv_header_netdb_h='yes'}
-ac_cv_header_netinet_in_h=${ac_cv_header_netinet_in_h='yes'}
-ac_cv_header_openssl_crypto_h=${ac_cv_header_openssl_crypto_h='yes'}
-ac_cv_header_openssl_err_h=${ac_cv_header_openssl_err_h='yes'}
-ac_cv_header_openssl_pem_h=${ac_cv_header_openssl_pem_h='yes'}
-ac_cv_header_openssl_rsa_h=${ac_cv_header_openssl_rsa_h='yes'}
-ac_cv_header_openssl_ssl_h=${ac_cv_header_openssl_ssl_h='yes'}
-ac_cv_header_openssl_x509_h=${ac_cv_header_openssl_x509_h='yes'}
-ac_cv_header_sgtty_h=${ac_cv_header_sgtty_h='yes'}
-ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
-ac_cv_header_sys_param_h=${ac_cv_header_sys_param_h='yes'}
-ac_cv_header_sys_select_h=${ac_cv_header_sys_select_h='yes'}
-ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h='yes'}
-ac_cv_header_sys_sockio_h=${ac_cv_header_sys_sockio_h='yes'}
-ac_cv_header_sys_stat_h=${ac_cv_header_sys_stat_h='yes'}
-ac_cv_header_sys_types_h=${ac_cv_header_sys_types_h='yes'}
-ac_cv_header_termio_h=${ac_cv_header_termio_h='yes'}
-ac_cv_header_termios_h=${ac_cv_header_termios_h='yes'}
-ac_cv_header_time=${ac_cv_header_time='yes'}
-ac_cv_header_time_h=${ac_cv_header_time_h='yes'}
-ac_cv_header_unistd_h=${ac_cv_header_unistd_h='yes'}
-ac_cv_header_winsock_h=${ac_cv_header_winsock_h='no'}
-ac_cv_lib_crypto_CRYPTO_lock=${ac_cv_lib_crypto_CRYPTO_lock='yes'}
-ac_cv_lib_dl_dlopen=${ac_cv_lib_dl_dlopen='yes'}
-ac_cv_lib_nsl_gethostbyname=${ac_cv_lib_nsl_gethostbyname='yes'}
-ac_cv_lib_socket_connect=${ac_cv_lib_socket_connect='yes'}
-ac_cv_lib_ssl_SSL_connect=${ac_cv_lib_ssl_SSL_connect='yes'}
-ac_cv_path_NROFF=${ac_cv_path_NROFF='/bin/nroff'}
-ac_cv_path_PERL=${ac_cv_path_PERL='/usr/local/bin/perl'}
-ac_cv_prog_CC=${ac_cv_prog_CC='gcc'}
-ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'}
-ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB='ranlib'}
-ac_cv_prog_YACC=${ac_cv_prog_YACC='bison -y'}
-ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross='no'}
-ac_cv_prog_cc_g=${ac_cv_prog_cc_g='yes'}
-ac_cv_prog_cc_works=${ac_cv_prog_cc_works='yes'}
-ac_cv_prog_gcc=${ac_cv_prog_gcc='yes'}
-ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set='yes'}
-ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double='16'}
-ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
-ac_cv_type_signal=${ac_cv_type_signal='void'}
-ac_cv_type_size_t=${ac_cv_type_size_t='yes'}
+++ /dev/null
-/* config.h. Generated automatically by configure. */
-/* config.h.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you have the vprintf function. */
-#define HAVE_VPRINTF 1
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define cpu-machine-OS */
-#define OS "sparc-sun-solaris2.6"
-
-/* The number of bytes in a long double. */
-#define SIZEOF_LONG_DOUBLE 16
-
-/* The number of bytes in a long long. */
-#define SIZEOF_LONG_LONG 8
-
-/* Define if you have the closesocket function. */
-/* #undef HAVE_CLOSESOCKET */
-
-/* Define if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define if you have the getpass function. */
-#define HAVE_GETPASS 1
-
-/* Define if you have the getservbyname function. */
-#define HAVE_GETSERVBYNAME 1
-
-/* Define if you have the gettimeofday function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have the inet_addr function. */
-#define HAVE_INET_ADDR 1
-
-/* Define if you have the inet_ntoa function. */
-#define HAVE_INET_NTOA 1
-
-/* Define if you have the perror function. */
-#define HAVE_PERROR 1
-
-/* Define if you have the select function. */
-#define HAVE_SELECT 1
-
-/* Define if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strftime function. */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the strstr function. */
-#define HAVE_STRSTR 1
-
-/* Define if you have the tcgetattr function. */
-#define HAVE_TCGETATTR 1
-
-/* Define if you have the tcsetattr function. */
-#define HAVE_TCSETATTR 1
-
-/* Define if you have the uname function. */
-#define HAVE_UNAME 1
-
-/* Define if you have the <alloca.h> header file. */
-#define HAVE_ALLOCA_H 1
-
-/* Define if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define if you have the <crypto.h> header file. */
-/* #undef HAVE_CRYPTO_H */
-
-/* Define if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if you have the <err.h> header file. */
-/* #undef HAVE_ERR_H */
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <getopt.h> header file. */
-/* #undef HAVE_GETOPT_H */
-
-/* Define if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
-/* Define if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define if you have the <openssl/crypto.h> header file. */
-#define HAVE_OPENSSL_CRYPTO_H 1
-
-/* Define if you have the <openssl/err.h> header file. */
-#define HAVE_OPENSSL_ERR_H 1
-
-/* Define if you have the <openssl/pem.h> header file. */
-#define HAVE_OPENSSL_PEM_H 1
-
-/* Define if you have the <openssl/rsa.h> header file. */
-#define HAVE_OPENSSL_RSA_H 1
-
-/* Define if you have the <openssl/ssl.h> header file. */
-#define HAVE_OPENSSL_SSL_H 1
-
-/* Define if you have the <openssl/x509.h> header file. */
-#define HAVE_OPENSSL_X509_H 1
-
-/* Define if you have the <pem.h> header file. */
-/* #undef HAVE_PEM_H */
-
-/* Define if you have the <rsa.h> header file. */
-/* #undef HAVE_RSA_H */
-
-/* Define if you have the <sgtty.h> header file. */
-#define HAVE_SGTTY_H 1
-
-/* Define if you have the <ssl.h> header file. */
-/* #undef HAVE_SSL_H */
-
-/* Define if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define if you have the <sys/sockio.h> header file. */
-#define HAVE_SYS_SOCKIO_H 1
-
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 1
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <winsock.h> header file. */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define if you have the <x509.h> header file. */
-/* #undef HAVE_X509_H */
-
-/* Define if you have the crypto library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
-
-/* Define if you have the dl library (-ldl). */
-#define HAVE_LIBDL 1
-
-/* Define if you have the nsl library (-lnsl). */
-#define HAVE_LIBNSL 1
-
-/* Define if you have the resolve library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define if you have the socket library (-lsocket). */
-#define HAVE_LIBSOCKET 1
-
-/* Define if you have the ssl library (-lssl). */
-#define HAVE_LIBSSL 1
-
-/* Define if you have the ucb library (-lucb). */
-/* #undef HAVE_LIBUCB */
-
-/* Name of package */
-#define PACKAGE "curl"
-
-/* Version number of package */
-#define VERSION "6.3.1"
-
+++ /dev/null
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-configure:562: checking for a BSD compatible install
-configure:615: checking whether build environment is sane
-configure:672: checking whether make sets ${MAKE}
-configure:718: checking for working aclocal
-configure:731: checking for working autoconf
-configure:744: checking for working automake
-configure:757: checking for working autoheader
-configure:770: checking for working makeinfo
-configure:787: checking for gcc
-configure:900: checking whether the C compiler (gcc ) works
-configure:916: gcc -o conftest conftest.c 1>&5
-configure:942: checking whether the C compiler (gcc ) is a cross-compiler
-configure:947: checking whether we are using GNU C
-configure:975: checking whether gcc accepts -g
-configure:1018: checking for a BSD compatible install
-configure:1071: checking whether make sets ${MAKE}
-configure:1099: checking how to run the C preprocessor
-configure:1179: checking for AIX
-configure:1205: checking for gethostbyname
-configure:1251: checking for gethostbyname in -lnsl
-configure:1301: checking for strcasecmp
-configure:1397: checking for connect
-configure:1443: checking for connect in -lsocket
-configure:1493: checking for gethostname
-configure:1589: checking for dlopen
-configure:1635: checking for dlopen in -ldl
-configure:1701: checking where to look for SSL
-configure:1713: checking for CRYPTO_lock in -lcrypto
-configure:1762: checking for SSL_connect in -lssl
-configure:1813: checking for openssl/x509.h
-configure:1813: checking for openssl/rsa.h
-configure:1813: checking for openssl/crypto.h
-configure:1813: checking for openssl/pem.h
-configure:1813: checking for openssl/ssl.h
-configure:1813: checking for openssl/err.h
-configure:1903: checking for ANSI C header files
-configure:2032: checking for unistd.h
-configure:2032: checking for arpa/inet.h
-configure:2032: checking for net/if.h
-configure:2032: checking for netinet/in.h
-configure:2032: checking for netdb.h
-configure:2032: checking for sys/select.h
-configure:2032: checking for sys/socket.h
-configure:2032: checking for sys/sockio.h
-configure:2032: checking for sys/stat.h
-configure:2032: checking for sys/types.h
-configure:2032: checking for getopt.h
-configure:2032: checking for sys/param.h
-configure:2032: checking for termios.h
-configure:2032: checking for termio.h
-configure:2032: checking for sgtty.h
-configure:2032: checking for fcntl.h
-configure:2032: checking for dlfcn.h
-configure:2032: checking for alloca.h
-configure:2032: checking for winsock.h
-configure:2032: checking for time.h
-configure:2032: checking for io.h
-configure:2071: checking for working const
-configure:2146: checking for size_t
-configure:2179: checking whether time.h and sys/time.h may both be included
-configure:2218: checking size of long double
-configure:2258: checking size of long long
-configure:2304: checking host system type
-configure:2330: checking return type of signal handlers
-configure:2371: checking for vprintf
-configure:2496: checking for socket
-configure:2496: checking for select
-configure:2496: checking for strdup
-configure:2496: checking for strstr
-configure:2496: checking for strftime
-configure:2496: checking for uname
-configure:2496: checking for strcasecmp
-configure:2496: checking for gethostname
-configure:2496: checking for gethostbyaddr
-configure:2496: checking for getservbyname
-configure:2496: checking for gettimeofday
-configure:2496: checking for inet_addr
-configure:2496: checking for inet_ntoa
-configure:2496: checking for tcsetattr
-configure:2496: checking for tcgetattr
-configure:2496: checking for perror
-configure:2496: checking for getpass
-configure:2496: checking for closesocket
-configure:2554: checking for perl
-configure:2593: checking for nroff
-configure:2633: checking for ranlib
-configure:2665: checking for bison
+++ /dev/null
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host pm1:
-#
-# ./configure --with-ssl=/home/dast
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
-for ac_option
-do
- case "$ac_option" in
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running ${CONFIG_SHELL-/bin/sh} ./configure --with-ssl=/home/dast --no-create --no-recursion"
- exec ${CONFIG_SHELL-/bin/sh} ./configure --with-ssl=/home/dast --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "./config.status generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "$ac_cs_usage"; exit 0 ;;
- *) echo "$ac_cs_usage"; exit 1 ;;
- esac
-done
-
-ac_given_srcdir=.
-ac_given_INSTALL="./install-sh -c"
-
-trap 'rm -fr Makefile src/Makefile lib/Makefile perl/checklinks.pl perl/getlinks.pl perl/formfind.pl perl/recursiveftpget.pl config.h src/config.h conftest*; exit 1' 1 2 15
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
-/^[ ]*VPATH[ ]*=[^:]*$/d
-
-s%@SHELL@%/bin/sh%g
-s%@CFLAGS@%-g -O2%g
-s%@CPPFLAGS@% -I/home/dast/include/openssl -I/home/dast/include%g
-s%@CXXFLAGS@%%g
-s%@FFLAGS@%%g
-s%@DEFS@%-DHAVE_CONFIG_H%g
-s%@LDFLAGS@%%g
-s%@LIBS@%-lssl -lcrypto -ldl -lsocket -lnsl -L/home/dast/lib%g
-s%@exec_prefix@%${prefix}%g
-s%@prefix@%/usr/local%g
-s%@program_transform_name@%s,x,x,%g
-s%@bindir@%${exec_prefix}/bin%g
-s%@sbindir@%${exec_prefix}/sbin%g
-s%@libexecdir@%${exec_prefix}/libexec%g
-s%@datadir@%${prefix}/share%g
-s%@sysconfdir@%${prefix}/etc%g
-s%@sharedstatedir@%${prefix}/com%g
-s%@localstatedir@%${prefix}/var%g
-s%@libdir@%${exec_prefix}/lib%g
-s%@includedir@%${prefix}/include%g
-s%@oldincludedir@%/usr/include%g
-s%@infodir@%${prefix}/info%g
-s%@mandir@%${prefix}/man%g
-s%@INSTALL_PROGRAM@%${INSTALL}%g
-s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
-s%@INSTALL_DATA@%${INSTALL} -m 644%g
-s%@PACKAGE@%curl%g
-s%@VERSION@%6.3.1%g
-s%@ACLOCAL@%aclocal%g
-s%@AUTOCONF@%autoconf%g
-s%@AUTOMAKE@%automake%g
-s%@AUTOHEADER@%autoheader%g
-s%@MAKEINFO@%makeinfo%g
-s%@SET_MAKE@%%g
-s%@CC@%gcc%g
-s%@CPP@%gcc -E%g
-s%@host@%sparc-sun-solaris2.6%g
-s%@host_alias@%sparc-sun-solaris2.6%g
-s%@host_cpu@%sparc%g
-s%@host_vendor@%sun%g
-s%@host_os@%solaris2.6%g
-s%@PERL@%/usr/local/bin/perl%g
-s%@NROFF@%/bin/nroff%g
-s%@RANLIB@%ranlib%g
-s%@YACC@%bison -y%g
-
-CEOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
- else
- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
- fi
- if test ! -s conftest.s$ac_file; then
- ac_more_lines=false
- rm -f conftest.s$ac_file
- else
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f conftest.s$ac_file"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
- fi
- ac_file=`expr $ac_file + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_cmds`
- fi
-done
-if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
-fi
-
-CONFIG_FILES=${CONFIG_FILES-"Makefile src/Makefile lib/Makefile perl/checklinks.pl perl/getlinks.pl perl/formfind.pl perl/recursiveftpget.pl "}
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
- # A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
- else
- ac_dir_suffix= ac_dots=
- fi
-
- case "$ac_given_srcdir" in
- .) srcdir=.
- if test -z "$ac_dots"; then top_srcdir=.
- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
- *) # Relative path.
- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
-
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
- case "$ac_file" in
- *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
- *) ac_comsub= ;;
- esac
-
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='\([ ]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
- CONFIG_HEADERS="config.h src/config.h"
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
- echo creating $ac_file
-
- rm -f conftest.frag conftest.in conftest.out
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- cat $ac_file_inputs > conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"curl"${ac_dD}
-${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"curl"${ac_uD}
-${ac_eA}PACKAGE${ac_eB}PACKAGE${ac_eC}"curl"${ac_eD}
-${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"6.3.1"${ac_dD}
-${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"6.3.1"${ac_uD}
-${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"6.3.1"${ac_eD}
-${ac_dA}HAVE_LIBNSL${ac_dB}HAVE_LIBNSL${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBNSL${ac_uB}HAVE_LIBNSL${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBNSL${ac_eB}HAVE_LIBNSL${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBSOCKET${ac_dB}HAVE_LIBSOCKET${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBSOCKET${ac_uB}HAVE_LIBSOCKET${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBSOCKET${ac_eB}HAVE_LIBSOCKET${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_LIBDL${ac_dB}HAVE_LIBDL${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBDL${ac_uB}HAVE_LIBDL${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBDL${ac_eB}HAVE_LIBDL${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBCRYPTO${ac_dB}HAVE_LIBCRYPTO${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBCRYPTO${ac_uB}HAVE_LIBCRYPTO${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBCRYPTO${ac_eB}HAVE_LIBCRYPTO${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBSSL${ac_dB}HAVE_LIBSSL${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBSSL${ac_uB}HAVE_LIBSSL${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBSSL${ac_eB}HAVE_LIBSSL${ac_eC}1${ac_eD}
-${ac_dA}HAVE_OPENSSL_X509_H${ac_dB}HAVE_OPENSSL_X509_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_X509_H${ac_uB}HAVE_OPENSSL_X509_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_X509_H${ac_eB}HAVE_OPENSSL_X509_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_OPENSSL_RSA_H${ac_dB}HAVE_OPENSSL_RSA_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_RSA_H${ac_uB}HAVE_OPENSSL_RSA_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_RSA_H${ac_eB}HAVE_OPENSSL_RSA_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_OPENSSL_CRYPTO_H${ac_dB}HAVE_OPENSSL_CRYPTO_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_CRYPTO_H${ac_uB}HAVE_OPENSSL_CRYPTO_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_CRYPTO_H${ac_eB}HAVE_OPENSSL_CRYPTO_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_OPENSSL_PEM_H${ac_dB}HAVE_OPENSSL_PEM_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_PEM_H${ac_uB}HAVE_OPENSSL_PEM_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_PEM_H${ac_eB}HAVE_OPENSSL_PEM_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_OPENSSL_SSL_H${ac_dB}HAVE_OPENSSL_SSL_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_SSL_H${ac_uB}HAVE_OPENSSL_SSL_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_SSL_H${ac_eB}HAVE_OPENSSL_SSL_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_OPENSSL_ERR_H${ac_dB}HAVE_OPENSSL_ERR_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_OPENSSL_ERR_H${ac_uB}HAVE_OPENSSL_ERR_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_OPENSSL_ERR_H${ac_eB}HAVE_OPENSSL_ERR_H${ac_eC}1${ac_eD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_eA}STDC_HEADERS${ac_eB}STDC_HEADERS${ac_eC}1${ac_eD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UNISTD_H${ac_eB}HAVE_UNISTD_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_ARPA_INET_H${ac_dB}HAVE_ARPA_INET_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_ARPA_INET_H${ac_uB}HAVE_ARPA_INET_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_ARPA_INET_H${ac_eB}HAVE_ARPA_INET_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_NET_IF_H${ac_dB}HAVE_NET_IF_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_NET_IF_H${ac_uB}HAVE_NET_IF_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_NET_IF_H${ac_eB}HAVE_NET_IF_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_NETINET_IN_H${ac_dB}HAVE_NETINET_IN_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_NETINET_IN_H${ac_uB}HAVE_NETINET_IN_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_NETINET_IN_H${ac_eB}HAVE_NETINET_IN_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_NETDB_H${ac_dB}HAVE_NETDB_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_NETDB_H${ac_uB}HAVE_NETDB_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_NETDB_H${ac_eB}HAVE_NETDB_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_SELECT_H${ac_dB}HAVE_SYS_SELECT_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_SELECT_H${ac_uB}HAVE_SYS_SELECT_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_SELECT_H${ac_eB}HAVE_SYS_SELECT_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_SYS_SOCKET_H${ac_dB}HAVE_SYS_SOCKET_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_SOCKET_H${ac_uB}HAVE_SYS_SOCKET_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_SOCKET_H${ac_eB}HAVE_SYS_SOCKET_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_SOCKIO_H${ac_dB}HAVE_SYS_SOCKIO_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_SOCKIO_H${ac_uB}HAVE_SYS_SOCKIO_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_SOCKIO_H${ac_eB}HAVE_SYS_SOCKIO_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_STAT_H${ac_eB}HAVE_SYS_STAT_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_TYPES_H${ac_eB}HAVE_SYS_TYPES_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_SYS_PARAM_H${ac_dB}HAVE_SYS_PARAM_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_PARAM_H${ac_uB}HAVE_SYS_PARAM_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_PARAM_H${ac_eB}HAVE_SYS_PARAM_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_TERMIOS_H${ac_dB}HAVE_TERMIOS_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TERMIOS_H${ac_uB}HAVE_TERMIOS_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TERMIOS_H${ac_eB}HAVE_TERMIOS_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_TERMIO_H${ac_dB}HAVE_TERMIO_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TERMIO_H${ac_uB}HAVE_TERMIO_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TERMIO_H${ac_eB}HAVE_TERMIO_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SGTTY_H${ac_dB}HAVE_SGTTY_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SGTTY_H${ac_uB}HAVE_SGTTY_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SGTTY_H${ac_eB}HAVE_SGTTY_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_FCNTL_H${ac_dB}HAVE_FCNTL_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_FCNTL_H${ac_uB}HAVE_FCNTL_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_FCNTL_H${ac_eB}HAVE_FCNTL_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_DLFCN_H${ac_dB}HAVE_DLFCN_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_DLFCN_H${ac_uB}HAVE_DLFCN_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_DLFCN_H${ac_eB}HAVE_DLFCN_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_ALLOCA_H${ac_dB}HAVE_ALLOCA_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_ALLOCA_H${ac_uB}HAVE_ALLOCA_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_ALLOCA_H${ac_eB}HAVE_ALLOCA_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_TIME_H${ac_dB}HAVE_TIME_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TIME_H${ac_uB}HAVE_TIME_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TIME_H${ac_eB}HAVE_TIME_H${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}TIME_WITH_SYS_TIME${ac_dB}TIME_WITH_SYS_TIME${ac_dC}1${ac_dD}
-${ac_uA}TIME_WITH_SYS_TIME${ac_uB}TIME_WITH_SYS_TIME${ac_uC}1${ac_uD}
-${ac_eA}TIME_WITH_SYS_TIME${ac_eB}TIME_WITH_SYS_TIME${ac_eC}1${ac_eD}
-${ac_dA}SIZEOF_LONG_DOUBLE${ac_dB}SIZEOF_LONG_DOUBLE${ac_dC}16${ac_dD}
-${ac_uA}SIZEOF_LONG_DOUBLE${ac_uB}SIZEOF_LONG_DOUBLE${ac_uC}16${ac_uD}
-${ac_eA}SIZEOF_LONG_DOUBLE${ac_eB}SIZEOF_LONG_DOUBLE${ac_eC}16${ac_eD}
-${ac_dA}SIZEOF_LONG_LONG${ac_dB}SIZEOF_LONG_LONG${ac_dC}8${ac_dD}
-${ac_uA}SIZEOF_LONG_LONG${ac_uB}SIZEOF_LONG_LONG${ac_uC}8${ac_uD}
-${ac_eA}SIZEOF_LONG_LONG${ac_eB}SIZEOF_LONG_LONG${ac_eC}8${ac_eD}
-${ac_dA}OS${ac_dB}OS${ac_dC}"sparc-sun-solaris2.6"${ac_dD}
-${ac_uA}OS${ac_uB}OS${ac_uC}"sparc-sun-solaris2.6"${ac_uD}
-${ac_eA}OS${ac_eB}OS${ac_eC}"sparc-sun-solaris2.6"${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}RETSIGTYPE${ac_dB}RETSIGTYPE${ac_dC}void${ac_dD}
-${ac_uA}RETSIGTYPE${ac_uB}RETSIGTYPE${ac_uC}void${ac_uD}
-${ac_eA}RETSIGTYPE${ac_eB}RETSIGTYPE${ac_eC}void${ac_eD}
-${ac_dA}HAVE_VPRINTF${ac_dB}HAVE_VPRINTF${ac_dC}1${ac_dD}
-${ac_uA}HAVE_VPRINTF${ac_uB}HAVE_VPRINTF${ac_uC}1${ac_uD}
-${ac_eA}HAVE_VPRINTF${ac_eB}HAVE_VPRINTF${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SOCKET${ac_dB}HAVE_SOCKET${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SOCKET${ac_uB}HAVE_SOCKET${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SOCKET${ac_eB}HAVE_SOCKET${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SELECT${ac_dB}HAVE_SELECT${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SELECT${ac_uB}HAVE_SELECT${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SELECT${ac_eB}HAVE_SELECT${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_STRDUP${ac_dB}HAVE_STRDUP${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRDUP${ac_uB}HAVE_STRDUP${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRDUP${ac_eB}HAVE_STRDUP${ac_eC}1${ac_eD}
-${ac_dA}HAVE_STRSTR${ac_dB}HAVE_STRSTR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRSTR${ac_uB}HAVE_STRSTR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRSTR${ac_eB}HAVE_STRSTR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_STRFTIME${ac_dB}HAVE_STRFTIME${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRFTIME${ac_uB}HAVE_STRFTIME${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRFTIME${ac_eB}HAVE_STRFTIME${ac_eC}1${ac_eD}
-${ac_dA}HAVE_UNAME${ac_dB}HAVE_UNAME${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UNAME${ac_uB}HAVE_UNAME${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UNAME${ac_eB}HAVE_UNAME${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_STRCASECMP${ac_dB}HAVE_STRCASECMP${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRCASECMP${ac_uB}HAVE_STRCASECMP${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRCASECMP${ac_eB}HAVE_STRCASECMP${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETHOSTNAME${ac_dB}HAVE_GETHOSTNAME${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETHOSTNAME${ac_uB}HAVE_GETHOSTNAME${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETHOSTNAME${ac_eB}HAVE_GETHOSTNAME${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETHOSTBYADDR${ac_dB}HAVE_GETHOSTBYADDR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETHOSTBYADDR${ac_uB}HAVE_GETHOSTBYADDR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETHOSTBYADDR${ac_eB}HAVE_GETHOSTBYADDR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETSERVBYNAME${ac_dB}HAVE_GETSERVBYNAME${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETSERVBYNAME${ac_uB}HAVE_GETSERVBYNAME${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETSERVBYNAME${ac_eB}HAVE_GETSERVBYNAME${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_GETTIMEOFDAY${ac_dB}HAVE_GETTIMEOFDAY${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETTIMEOFDAY${ac_uB}HAVE_GETTIMEOFDAY${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETTIMEOFDAY${ac_eB}HAVE_GETTIMEOFDAY${ac_eC}1${ac_eD}
-${ac_dA}HAVE_INET_ADDR${ac_dB}HAVE_INET_ADDR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_INET_ADDR${ac_uB}HAVE_INET_ADDR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_INET_ADDR${ac_eB}HAVE_INET_ADDR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_INET_NTOA${ac_dB}HAVE_INET_NTOA${ac_dC}1${ac_dD}
-${ac_uA}HAVE_INET_NTOA${ac_uB}HAVE_INET_NTOA${ac_uC}1${ac_uD}
-${ac_eA}HAVE_INET_NTOA${ac_eB}HAVE_INET_NTOA${ac_eC}1${ac_eD}
-${ac_dA}HAVE_TCSETATTR${ac_dB}HAVE_TCSETATTR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TCSETATTR${ac_uB}HAVE_TCSETATTR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TCSETATTR${ac_eB}HAVE_TCSETATTR${ac_eC}1${ac_eD}
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- cat > conftest.frag <<CEOF
-${ac_dA}HAVE_TCGETATTR${ac_dB}HAVE_TCGETATTR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TCGETATTR${ac_uB}HAVE_TCGETATTR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TCGETATTR${ac_eB}HAVE_TCGETATTR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_PERROR${ac_dB}HAVE_PERROR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_PERROR${ac_uB}HAVE_PERROR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_PERROR${ac_eB}HAVE_PERROR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETPASS${ac_dB}HAVE_GETPASS${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETPASS${ac_uB}HAVE_GETPASS${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETPASS${ac_eB}HAVE_GETPASS${ac_eC}1${ac_eD}
-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-
- rm -f conftest.frag conftest.h
- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
- cat conftest.in >> conftest.h
- rm -f conftest.in
- if cmp -s $ac_file conftest.h 2>/dev/null; then
- echo "$ac_file is unchanged"
- rm -f conftest.h
- else
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- fi
- rm -f $ac_file
- mv conftest.h $ac_file
- fi
-fi; done
-
-
-
-am_indx=1
-for am_file in config.h src/config.h; do
- case " $CONFIG_HEADERS " in
- *" $am_file "*)
- echo timestamp > `echo $am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
- ;;
- esac
- am_indx=`expr "$am_indx" + 1`
-done
-
-exit 0
+++ /dev/null
-? Makefile.in
-? autogen.sh
-? configure
-? lib/Makefile.in
-? src/Makefile.in
-Index: config.h.in
-===================================================================
-RCS file: /cvs/curl/curl/config.h.in,v
-retrieving revision 1.10
-diff -u -r1.10 config.h.in
---- config.h.in 1999/10/17 11:18:34 1.10
-+++ config.h.in 1999/11/24 15:15:21
-@@ -109,6 +109,9 @@
- /* Define if you have the <getopt.h> header file. */
- #undef HAVE_GETOPT_H
-
-+/* Define if you have the <net/if.h> header file. */
-+#undef HAVE_NET_IF_H
-+
- /* Define if you have the <netdb.h> header file. */
- #undef HAVE_NETDB_H
-
-Index: configure.in
-===================================================================
-RCS file: /cvs/curl/curl/configure.in,v
-retrieving revision 1.35
-diff -u -r1.35 configure.in
---- configure.in 1999/11/11 21:05:38 1.35
-+++ configure.in 1999/11/24 15:15:21
-@@ -117,24 +117,26 @@
-
- dnl Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS( unistd.h \
-- arpa/inet.h \
-- netinet/in.h \
-- netdb.h \
-- sys/select.h \
-- sys/socket.h \
-- sys/sockio.h \
-- sys/stat.h \
-- sys/types.h \
-- getopt.h \
-- sys/param.h \
-- termios.h \
-- termio.h \
-- sgtty.h \
-- fcntl.h \
-- dlfcn.h \
-- alloca.h )
--
-+AC_CHECK_HEADERS( \
-+ unistd.h \
-+ arpa/inet.h \
-+ net/if.h \
-+ netinet/in.h \
-+ netdb.h \
-+ sys/select.h \
-+ sys/socket.h \
-+ sys/sockio.h \
-+ sys/stat.h \
-+ sys/types.h \
-+ getopt.h \
-+ sys/param.h \
-+ termios.h \
-+ termio.h \
-+ sgtty.h \
-+ fcntl.h \
-+ dlfcn.h \
-+ alloca.h \
-+)
-
- dnl Check for libz header
- dnl AC_CHECK_HEADERS(zlib.h)
-Index: include/curl/curl.h
-===================================================================
-RCS file: /cvs/curl/curl/include/curl/curl.h,v
-retrieving revision 1.5
-diff -u -r1.5 curl.h
---- curl.h 1999/11/23 08:22:42 1.5
-+++ curl.h 1999/11/24 15:15:21
-@@ -365,9 +365,13 @@
- TIMECOND_LAST
- } TimeCond;
-
-+#ifdef __BEOS__
-+#include <support/SupportDefs.h>
-+#else
- #ifndef __cplusplus /* (rabe) */
- typedef char bool;
- #endif /* (rabe) */
-+#endif
-
- /**********************************************************************
- *
-Index: lib/Makefile.am
-===================================================================
-RCS file: /cvs/curl/curl/lib/Makefile.am,v
-retrieving revision 1.16
-diff -u -r1.16 Makefile.am
---- Makefile.am 1999/10/22 13:27:36 1.16
-+++ Makefile.am 1999/11/24 15:15:21
-@@ -9,7 +9,7 @@
- # Some flags needed when trying to cause warnings ;-)
- # CFLAGS = -Wall -pedantic
-
--INCLUDES = -I../include
-+INCLUDES = -I$(top_srcdir)/include
-
- libcurl_a_SOURCES = \
- arpa_telnet.h file.c getpass.h netrc.h timeval.c \
-Index: lib/dict.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/dict.c,v
-retrieving revision 1.5
-diff -u -r1.5 dict.c
---- dict.c 1999/10/13 22:27:12 1.5
-+++ dict.c 1999/11/24 15:15:22
-@@ -66,8 +66,12 @@
- #include <unistd.h>
- #endif
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
- #include <signal.h>
-
-Index: lib/download.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/download.c,v
-retrieving revision 1.30
-diff -u -r1.30 download.c
---- download.c 1999/11/23 08:24:26 1.30
-+++ download.c 1999/11/24 15:15:23
-@@ -54,6 +54,10 @@
- #include "urldata.h"
- #include <curl/curl.h>
-
-+#ifdef __BEOS__
-+#include <net/socket.h>
-+#endif
-+
- #ifdef WIN32
- #if !defined( __GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Index: lib/file.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/file.c,v
-retrieving revision 1.6
-diff -u -r1.6 file.c
---- file.c 1999/11/19 07:25:40 1.6
-+++ file.c 1999/11/24 15:15:23
-@@ -67,8 +67,12 @@
- #include <unistd.h>
- #endif
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
- #include <signal.h>
-
-Index: lib/ftp.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/ftp.c,v
-retrieving revision 1.18
-diff -u -r1.18 ftp.c
---- ftp.c 1999/11/23 08:25:06 1.18
-+++ ftp.c 1999/11/24 15:15:26
-@@ -58,7 +58,9 @@
- #else /* some kind of unix */
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
- #include <sys/utsname.h>
- #include <netdb.h>
- #endif
-Index: lib/getdate.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/getdate.c,v
-retrieving revision 1.5
-diff -u -r1.5 getdate.c
---- getdate.c 1999/08/12 06:43:33 1.5
-+++ getdate.c 1999/11/24 15:15:31
-@@ -1,26 +1,26 @@
-
- /* A Bison parser, made from getdate.y
-- by GNU Bison version 1.25
-+ by GNU Bison version 1.27
- */
-
- #define YYBISON 1 /* Identify Bison output. */
-
--#define tAGO 258
--#define tDAY 259
--#define tDAY_UNIT 260
--#define tDAYZONE 261
--#define tDST 262
--#define tHOUR_UNIT 263
--#define tID 264
--#define tMERIDIAN 265
--#define tMINUTE_UNIT 266
--#define tMONTH 267
--#define tMONTH_UNIT 268
--#define tSEC_UNIT 269
--#define tSNUMBER 270
--#define tUNUMBER 271
--#define tYEAR_UNIT 272
--#define tZONE 273
-+#define tAGO 257
-+#define tDAY 258
-+#define tDAY_UNIT 259
-+#define tDAYZONE 260
-+#define tDST 261
-+#define tHOUR_UNIT 262
-+#define tID 263
-+#define tMERIDIAN 264
-+#define tMINUTE_UNIT 265
-+#define tMONTH 266
-+#define tMONTH_UNIT 267
-+#define tSEC_UNIT 268
-+#define tSNUMBER 269
-+#define tUNUMBER 270
-+#define tYEAR_UNIT 271
-+#define tZONE 272
-
- #line 1 "getdate.y"
-
-@@ -211,9 +211,11 @@
-
- #ifndef __cplusplus
- #ifndef __STDC__
-+#ifndef const
- #define const
- #endif
- #endif
-+#endif
-
-
-
-@@ -221,7 +223,7 @@
- #define YYFLAG -32768
- #define YYNTBASE 22
-
--#define YYTRANSLATE(x) ((unsigned)(x) <= 273 ? yytranslate[x] : 32)
-+#define YYTRANSLATE(x) ((unsigned)(x) <= 272 ? yytranslate[x] : 32)
-
- static const char yytranslate[] = { 0,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-@@ -249,9 +251,9 @@
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
-- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-- 16, 17, 18
-+ 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
-+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-+ 17, 18
- };
-
- #if YYDEBUG != 0
-@@ -370,7 +372,8 @@
- 56
- };
- /* -*-C-*- Note some compilers choke on comments on `#line' lines. */
--#line 3 "/usr/lib/bison.simple"
-+#line 3 "/boot/apps/GeekGadgets/share/bison.simple"
-+/* This file comes from bison-1.27. */
-
- /* Skeleton output parser for bison,
- Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-@@ -387,46 +390,66 @@
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-+ Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-
- /* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
- This special exception was added by the Free Software Foundation
- in version 1.24 of Bison. */
-
--#ifndef alloca
-+/* This is the parser code that is written into each bison parser
-+ when the %semantic_parser declaration is not specified in the grammar.
-+ It was written by Richard Stallman by simplifying the hairy parser
-+ used when %semantic_parser is specified. */
-+
-+#ifndef YYSTACK_USE_ALLOCA
-+#ifdef alloca
-+#define YYSTACK_USE_ALLOCA
-+#else /* alloca not defined */
- #ifdef __GNUC__
-+#define YYSTACK_USE_ALLOCA
- #define alloca __builtin_alloca
- #else /* not GNU C. */
--#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
-+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-+#define YYSTACK_USE_ALLOCA
- #include <alloca.h>
- #else /* not sparc */
--#if defined (MSDOS) && !defined (__TURBOC__)
-+/* We think this test detects Watcom and Microsoft C. */
-+/* This used to test MSDOS, but that is a bad idea
-+ since that symbol is in the user namespace. */
-+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-+#if 0 /* No need for malloc.h, which pollutes the namespace;
-+ instead, just don't use alloca. */
- #include <malloc.h>
-+#endif
- #else /* not MSDOS, or __TURBOC__ */
- #if defined(_AIX)
--#include <malloc.h>
-+/* I don't know what this was needed for, but it pollutes the namespace.
-+ So I turned it off. rms, 2 May 1997. */
-+/* #include <malloc.h> */
- #pragma alloca
--#else /* not MSDOS, __TURBOC__, or _AIX */
--#ifdef __hpux
--#ifdef __cplusplus
--extern "C" {
--void *alloca (unsigned int);
--};
--#else /* not __cplusplus */
--void *alloca ();
--#endif /* not __cplusplus */
-+#define YYSTACK_USE_ALLOCA
-+#else /* not MSDOS, or __TURBOC__, or _AIX */
-+#if 0
-+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-+ and on HPUX 10. Eventually we can turn this on. */
-+#define YYSTACK_USE_ALLOCA
-+#define alloca __builtin_alloca
- #endif /* __hpux */
-+#endif
- #endif /* not _AIX */
- #endif /* not MSDOS, or __TURBOC__ */
--#endif /* not sparc. */
--#endif /* not GNU C. */
--#endif /* alloca not defined. */
-+#endif /* not sparc */
-+#endif /* not GNU C */
-+#endif /* alloca not defined */
-+#endif /* YYSTACK_USE_ALLOCA not defined */
-
--/* This is the parser code that is written into each bison parser
-- when the %semantic_parser declaration is not specified in the grammar.
-- It was written by Richard Stallman by simplifying the hairy parser
-- used when %semantic_parser is specified. */
-+#ifdef YYSTACK_USE_ALLOCA
-+#define YYSTACK_ALLOC alloca
-+#else
-+#define YYSTACK_ALLOC malloc
-+#endif
-
- /* Note: there must be only one dollar sign in this file.
- It is replaced by the list of actions, each action
-@@ -436,8 +459,8 @@
- #define yyclearin (yychar = YYEMPTY)
- #define YYEMPTY -2
- #define YYEOF 0
--#define YYACCEPT return(0)
--#define YYABORT return(1)
-+#define YYACCEPT goto yyacceptlab
-+#define YYABORT goto yyabortlab
- #define YYERROR goto yyerrlab1
- /* Like YYERROR except do call yyerror.
- This remains here temporarily to ease the
-@@ -518,12 +541,12 @@
- #ifndef YYMAXDEPTH
- #define YYMAXDEPTH 10000
- #endif
--
--/* Prevent warning if -Wstrict-prototypes. */
--#ifdef __GNUC__
--int yyparse (void);
--#endif
- \f
-+/* Define __yy_memcpy. Note that the size argument
-+ should be passed with type unsigned int, because that is what the non-GCC
-+ definitions require. With GCC, __builtin_memcpy takes an arg
-+ of type size_t, but it can handle unsigned int. */
-+
- #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
- #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
- #else /* not GNU C or C++ */
-@@ -535,7 +558,7 @@
- __yy_memcpy (to, from, count)
- char *to;
- char *from;
-- int count;
-+ unsigned int count;
- {
- register char *f = from;
- register char *t = to;
-@@ -550,10 +573,10 @@
- /* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
- static void
--__yy_memcpy (char *to, char *from, int count)
-+__yy_memcpy (char *to, char *from, unsigned int count)
- {
-- register char *f = from;
- register char *t = to;
-+ register char *f = from;
- register int i = count;
-
- while (i-- > 0)
-@@ -563,7 +586,7 @@
- #endif
- #endif
- \f
--#line 196 "/usr/lib/bison.simple"
-+#line 216 "/boot/apps/GeekGadgets/share/bison.simple"
-
- /* The user can define YYPARSE_PARAM as the name of an argument to be passed
- into yyparse. The argument should have type void *.
-@@ -584,6 +607,15 @@
- #define YYPARSE_PARAM_DECL
- #endif /* not YYPARSE_PARAM */
-
-+/* Prevent warning if -Wstrict-prototypes. */
-+#ifdef __GNUC__
-+#ifdef YYPARSE_PARAM
-+int yyparse (void *);
-+#else
-+int yyparse (void);
-+#endif
-+#endif
-+
- int
- yyparse(YYPARSE_PARAM_ARG)
- YYPARSE_PARAM_DECL
-@@ -612,6 +644,7 @@
- #endif
-
- int yystacksize = YYINITDEPTH;
-+ int yyfree_stacks = 0;
-
- #ifdef YYPURE
- int yychar;
-@@ -696,18 +729,32 @@
- if (yystacksize >= YYMAXDEPTH)
- {
- yyerror("parser stack overflow");
-+ if (yyfree_stacks)
-+ {
-+ free (yyss);
-+ free (yyvs);
-+#ifdef YYLSP_NEEDED
-+ free (yyls);
-+#endif
-+ }
- return 2;
- }
- yystacksize *= 2;
- if (yystacksize > YYMAXDEPTH)
- yystacksize = YYMAXDEPTH;
-- yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-- __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
-- yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-- __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
-+#ifndef YYSTACK_USE_ALLOCA
-+ yyfree_stacks = 1;
-+#endif
-+ yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-+ __yy_memcpy ((char *)yyss, (char *)yyss1,
-+ size * (unsigned int) sizeof (*yyssp));
-+ yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-+ __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-+ size * (unsigned int) sizeof (*yyvsp));
- #ifdef YYLSP_NEEDED
-- yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-- __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
-+ yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-+ __yy_memcpy ((char *)yyls, (char *)yyls1,
-+ size * (unsigned int) sizeof (*yylsp));
- #endif
- #endif /* no yyoverflow */
-
-@@ -1230,7 +1277,7 @@
- break;}
- }
- /* the action file gets copied in in place of this dollarsign */
--#line 498 "/usr/lib/bison.simple"
-+#line 542 "/boot/apps/GeekGadgets/share/bison.simple"
- \f
- yyvsp -= yylen;
- yyssp -= yylen;
-@@ -1425,6 +1472,30 @@
-
- yystate = yyn;
- goto yynewstate;
-+
-+ yyacceptlab:
-+ /* YYACCEPT comes here. */
-+ if (yyfree_stacks)
-+ {
-+ free (yyss);
-+ free (yyvs);
-+#ifdef YYLSP_NEEDED
-+ free (yyls);
-+#endif
-+ }
-+ return 0;
-+
-+ yyabortlab:
-+ /* YYABORT comes here. */
-+ if (yyfree_stacks)
-+ {
-+ free (yyss);
-+ free (yyvs);
-+#ifdef YYLSP_NEEDED
-+ free (yyls);
-+#endif
-+ }
-+ return 1;
- }
- #line 451 "getdate.y"
-
-Index: lib/hostip.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/hostip.c,v
-retrieving revision 1.8
-diff -u -r1.8 hostip.c
---- hostip.c 1999/10/13 22:27:12 1.8
-+++ hostip.c 1999/11/24 15:15:31
-@@ -53,7 +53,9 @@
- #endif
- #include <netinet/in.h>
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
- #endif
-
- #include "urldata.h"
-Index: lib/http.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/http.c,v
-retrieving revision 1.17
-diff -u -r1.17 http.c
---- http.c 1999/10/30 15:43:52 1.17
-+++ http.c 1999/11/24 15:15:31
-@@ -66,8 +66,12 @@
- #include <unistd.h>
- #endif
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
- #include <signal.h>
-
-Index: lib/if2ip.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/if2ip.c,v
-retrieving revision 1.7
-diff -u -r1.7 if2ip.c
---- if2ip.c 1999/10/13 22:27:12 1.7
-+++ if2ip.c 1999/11/24 15:15:31
-@@ -48,13 +48,17 @@
- #include <unistd.h>
- #endif
-
--#ifndef WIN32
-+#if ! defined(WIN32) && ! defined(__BEOS__)
-
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
- #include <netinet/in.h>
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
-
- /* -- if2ip() -- */
-Index: lib/if2ip.h
-===================================================================
-RCS file: /cvs/curl/curl/lib/if2ip.h,v
-retrieving revision 1.5
-diff -u -r1.5 if2ip.h
---- if2ip.h 1999/10/13 22:27:12 1.5
-+++ if2ip.h 1999/11/24 15:15:31
-@@ -41,7 +41,7 @@
- ****************************************************************************/
- #include <curl/setup.h>
-
--#ifndef WIN32
-+#if ! defined(WIN32) && ! defined(__BEOS__)
- char *if2ip(char *interface);
- #else
- #define if2ip(x) NULL
-Index: lib/telnet.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/telnet.c,v
-retrieving revision 1.9
-diff -u -r1.9 telnet.c
---- telnet.c 1999/10/13 22:27:12 1.9
-+++ telnet.c 1999/11/24 15:15:32
-@@ -74,8 +74,12 @@
- #include <unistd.h>
- #endif
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
- #include <signal.h>
-
-Index: lib/upload.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/upload.c,v
-retrieving revision 1.9
-diff -u -r1.9 upload.c
---- upload.c 1999/10/13 22:27:12 1.9
-+++ upload.c 1999/11/24 15:15:32
-@@ -58,6 +58,11 @@
- #endif
-
- #include <curl/curl.h>
-+
-+#ifdef __BEOS__
-+#include <net/socket.h>
-+#endif
-+
- #include "urldata.h"
- #include "speedcheck.h"
- #include "sendf.h"
-Index: lib/url.c
-===================================================================
-RCS file: /cvs/curl/curl/lib/url.c,v
-retrieving revision 1.31
-diff -u -r1.31 url.c
---- url.c 1999/11/19 07:07:10 1.31
-+++ url.c 1999/11/24 15:15:36
-@@ -71,8 +71,12 @@
- #include <unistd.h>
- #endif
- #include <netdb.h>
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
-+#ifdef HAVE_NET_IF_H
- #include <net/if.h>
-+#endif
- #include <sys/ioctl.h>
- #include <signal.h>
-
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvs/curl/curl/src/Makefile.am,v
-retrieving revision 1.13
-diff -u -r1.13 Makefile.am
---- Makefile.am 1999/10/13 22:50:30 1.13
-+++ Makefile.am 1999/11/24 15:15:36
-@@ -6,7 +6,7 @@
- # CFLAGS = -Wall -pedantic
- CPPFLAGS = -DGLOBURL -DCURL_SEPARATORS
-
--INCLUDES = -I../include
-+INCLUDES = -I$(top_srcdir)/include
-
- bin_PROGRAMS = curl
-
-@@ -22,6 +22,6 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
-
- # This generates the hugehelp.c file
--hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
-+hugehelp.c: $(top_srcdir)/README.curl $(top_srcdir)/curl.1 mkhelp.pl
- rm -f hugehelp.c
-- $(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
-+ $(NROFF) -man $(top_srcdir)/curl.1 | $(PERL) $(top_srcdir)/src/mkhelp.pl $(top_srcdir)/README.curl > hugehelp.c
+++ /dev/null
-Only in curl-6.3.1: config-win32.h
-Only in curl-6.3.1: config-win32.h~
-Only in curl-6.3.1: config.cache
-Only in curl-6.3.1: config.h
-diff -cr curl-6.3.1-org/config.h.in curl-6.3.1/config.h.in
-*** curl-6.3.1-org/config.h.in Sun Oct 17 13:18:34 1999
---- curl-6.3.1/config.h.in Thu Dec 9 14:23:01 1999
-***************
-*** 37,42 ****
---- 37,45 ----
- /* The number of bytes in a long long. */
- #undef SIZEOF_LONG_LONG
-
-+ /* Define if you have the closesocket function. */
-+ #undef HAVE_CLOSESOCKET
-+
- /* Define if you have the gethostbyaddr function. */
- #undef HAVE_GETHOSTBYADDR
-
-***************
-*** 109,114 ****
---- 112,120 ----
- /* Define if you have the <getopt.h> header file. */
- #undef HAVE_GETOPT_H
-
-+ /* Define if you have the <io.h> header file. */
-+ #undef HAVE_IO_H
-+
- /* Define if you have the <netdb.h> header file. */
- #undef HAVE_NETDB_H
-
-***************
-*** 169,177 ****
---- 175,189 ----
- /* Define if you have the <termios.h> header file. */
- #undef HAVE_TERMIOS_H
-
-+ /* Define if you have the <time.h> header file. */
-+ #undef HAVE_TIME_H
-+
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+ /* Define if you have the <winsock.h> header file. */
-+ #undef HAVE_WINSOCK_H
-+
- /* Define if you have the <x509.h> header file. */
- #undef HAVE_X509_H
-
-Only in curl-6.3.1: config.log
-Only in curl-6.3.1: config.status
-Only in curl-6.3.1: configure
-diff -cr curl-6.3.1-org/configure.in curl-6.3.1/configure.in
-*** curl-6.3.1-org/configure.in Wed Nov 24 14:48:38 1999
---- curl-6.3.1/configure.in Thu Dec 9 14:34:36 1999
-***************
-*** 1,7 ****
- dnl $Id$
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(lib/urldata.h)
-! AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(curl,"6.3.1")
-
- dnl Checks for programs.
---- 1,7 ----
- dnl $Id$
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(lib/urldata.h)
-! AM_CONFIG_HEADER(config.h src/config.h)
- AM_INIT_AUTOMAKE(curl,"6.3.1")
-
- dnl Checks for programs.
-***************
-*** 133,139 ****
- sgtty.h \
- fcntl.h \
- dlfcn.h \
-! alloca.h )
-
-
- dnl Check for libz header
---- 133,143 ----
- sgtty.h \
- fcntl.h \
- dlfcn.h \
-! alloca.h \
-! winsock.h \
-! time.h \
-! io.h
-! )
-
-
- dnl Check for libz header
-***************
-*** 175,181 ****
- tcsetattr \
- tcgetattr \
- perror \
-! getpass )
-
-
-
---- 179,187 ----
- tcsetattr \
- tcgetattr \
- perror \
-! getpass \
-! closesocket
-! )
-
-
-
-Only in curl-6.3.1: configure.in~
-Common subdirectories: curl-6.3.1-org/include and curl-6.3.1/include
-Common subdirectories: curl-6.3.1-org/lib and curl-6.3.1/lib
-Common subdirectories: curl-6.3.1-org/perl and curl-6.3.1/perl
-Common subdirectories: curl-6.3.1-org/src and curl-6.3.1/src
-Only in curl-6.3.1: stamp-h1
-Common subdirectories: curl-6.3.1-org/include/curl and curl-6.3.1/include/curl
-diff -cr curl-6.3.1-org/include/curl/curl.h curl-6.3.1/include/curl/curl.h
-*** curl-6.3.1-org/include/curl/curl.h Wed Nov 24 14:48:37 1999
---- curl-6.3.1/include/curl/curl.h Wed Dec 8 15:34:53 1999
-***************
-*** 352,360 ****
---- 352,367 ----
- /* HTTP request, for odd commands like DELETE, TRACE and others */
- T(HTTPREQUEST, OBJECTPOINT, 35),
-
-+ /* Progress mode sets alternative progress mode displays, the only
-+ one defined today is 1 which makes the #-style progress bar. */
-+ T(PROGRESSMODE, LONG, 36),
-+
- URGTAG_LASTENTRY /* the last unusued */
- } UrgTag;
-
-+ #define CURL_PROGRESS_STATS 0 /* default progress display */
-+ #define CURL_PROGRESS_BAR 1
-+
- typedef enum {
- TIMECOND_NONE,
-
-Only in curl-6.3.1/include/curl: curl.h~
-Only in curl-6.3.1-org/include/curl: setup.h
-Only in curl-6.3.1/include/curl: setup.h~
-diff -cr curl-6.3.1-org/lib/Makefile curl-6.3.1/lib/Makefile
-*** curl-6.3.1-org/lib/Makefile Wed Dec 8 13:38:22 1999
---- curl-6.3.1/lib/Makefile Thu Dec 9 15:42:21 1999
-***************
-*** 90,98 ****
-
-
- DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-! CPPFLAGS =
-! LDFLAGS =
-! LIBS = -ldl -lsocket -lnsl
- libcurl_a_LIBADD =
- libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
- formdata.o upload.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
---- 90,98 ----
-
-
- DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-! CPPFLAGS = -I/homes/qradlsg/openssl-0.9.4/include
-! LDFLAGS = -L/homes/qradlsg/openssl-0.9.4
-! LIBS = -lssl -lcrypto -ldl -lsocket -lnsl
- libcurl_a_LIBADD =
- libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
- formdata.o upload.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
-***************
-*** 99,105 ****
- speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
- escape.o mprintf.o telnet.o getpass.o netrc.o
- AR = ar
-! CFLAGS = -g -O2
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
---- 99,105 ----
- speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
- escape.o mprintf.o telnet.o getpass.o netrc.o
- AR = ar
-! CFLAGS = -g -O2 -Wall -pedantic
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-Only in curl-6.3.1/lib: Makefile~
-diff -cr curl-6.3.1-org/lib/cookie.c curl-6.3.1/lib/cookie.c
-*** curl-6.3.1-org/lib/cookie.c Fri Nov 12 15:54:59 1999
---- curl-6.3.1/lib/cookie.c Thu Dec 9 15:44:37 1999
-***************
-*** 60,66 ****
- #include <ctype.h>
-
- #include "cookie.h"
-! #include <curl/setup.h>
- #include "getdate.h"
-
- /****************************************************************************
---- 60,66 ----
- #include <ctype.h>
-
- #include "cookie.h"
-! #include "setup.h"
- #include "getdate.h"
-
- /****************************************************************************
-***************
-*** 134,140 ****
- }
- }
- ptr=strtok(NULL, ";");
-! while(ptr && *ptr && isspace(*ptr))
- ptr++;
- }
- }
---- 134,140 ----
- }
- }
- ptr=strtok(NULL, ";");
-! while(ptr && *ptr && isspace((int)*ptr))
- ptr++;
- }
- }
-***************
-*** 288,294 ****
- {
- char line[MAX_COOKIE_LINE];
- struct CookieInfo *c;
-- struct Cookie *co;
- FILE *fp;
-
- c = (struct CookieInfo *)malloc(sizeof(struct CookieInfo));
---- 288,293 ----
-***************
-*** 303,309 ****
- if(strnequal("Set-Cookie:", line, 11)) {
- /* This is a cookie line, get it! */
- char *lineptr=&line[11];
-! while(*lineptr && isspace(*lineptr))
- lineptr++;
-
- cookie_add(c, TRUE, lineptr);
---- 302,308 ----
- if(strnequal("Set-Cookie:", line, 11)) {
- /* This is a cookie line, get it! */
- char *lineptr=&line[11];
-! while(*lineptr && isspace((int)*lineptr))
- lineptr++;
-
- cookie_add(c, TRUE, lineptr);
-***************
-*** 311,317 ****
- else {
- /* This might be a netscape cookie-file line, get it! */
- char *lineptr=line;
-! while(*lineptr && isspace(*lineptr))
- lineptr++;
-
- cookie_add(c, FALSE, lineptr);
---- 310,316 ----
- else {
- /* This might be a netscape cookie-file line, get it! */
- char *lineptr=line;
-! while(*lineptr && isspace((int)*lineptr))
- lineptr++;
-
- cookie_add(c, FALSE, lineptr);
-Only in curl-6.3.1/lib: cookie.c~
-Binary files curl-6.3.1-org/lib/cookie.o and curl-6.3.1/lib/cookie.o differ
-diff -cr curl-6.3.1-org/lib/dict.c curl-6.3.1/lib/dict.c
-*** curl-6.3.1-org/lib/dict.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/dict.c Thu Dec 9 14:27:23 1999
-***************
-*** 49,55 ****
-
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 49,55 ----
-
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Binary files curl-6.3.1-org/lib/dict.o and curl-6.3.1/lib/dict.o differ
-diff -cr curl-6.3.1-org/lib/download.c curl-6.3.1/lib/download.c
-*** curl-6.3.1-org/lib/download.c Tue Nov 23 09:24:26 1999
---- curl-6.3.1/lib/download.c Thu Dec 9 14:27:23 1999
-***************
-*** 42,48 ****
- #include <stdio.h>
- #include <string.h>
-
-! #include <curl/setup.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- 42,48 ----
- #include <stdio.h>
- #include <string.h>
-
-! #include "setup.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Binary files curl-6.3.1-org/lib/download.o and curl-6.3.1/lib/download.o differ
-diff -cr curl-6.3.1-org/lib/file.c curl-6.3.1/lib/file.c
-*** curl-6.3.1-org/lib/file.c Fri Nov 19 08:25:40 1999
---- curl-6.3.1/lib/file.c Thu Dec 9 14:27:24 1999
-***************
-*** 49,55 ****
-
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 49,55 ----
-
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Binary files curl-6.3.1-org/lib/file.o and curl-6.3.1/lib/file.o differ
-diff -cr curl-6.3.1-org/lib/formdata.c curl-6.3.1/lib/formdata.c
-*** curl-6.3.1-org/lib/formdata.c Tue Nov 23 17:54:36 1999
---- curl-6.3.1/lib/formdata.c Thu Dec 9 14:27:25 1999
-***************
-*** 56,62 ****
-
- #include <time.h>
-
-! #include <curl/setup.h>
- #include <curl/curl.h>
- #include "formdata.h"
-
---- 56,62 ----
-
- #include <time.h>
-
-! #include "setup.h"
- #include <curl/curl.h>
- #include "formdata.h"
-
-Binary files curl-6.3.1-org/lib/formdata.o and curl-6.3.1/lib/formdata.o differ
-diff -cr curl-6.3.1-org/lib/ftp.c curl-6.3.1/lib/ftp.c
-*** curl-6.3.1-org/lib/ftp.c Tue Nov 23 09:25:06 1999
---- curl-6.3.1/lib/ftp.c Thu Dec 9 15:43:10 1999
-***************
-*** 44,50 ****
- #include <ctype.h>
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- 44,50 ----
- #include <ctype.h>
- #include <errno.h>
-
-! #include "setup.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-***************
-*** 728,734 ****
- char *ptr2;
-
- from=strtol(data->range, &ptr, 0);
-! while(ptr && *ptr && (isspace(*ptr) || (*ptr=='-')))
- ptr++;
- to=strtol(ptr, &ptr2, 0);
- if(ptr == ptr2) {
---- 728,734 ----
- char *ptr2;
-
- from=strtol(data->range, &ptr, 0);
-! while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
- ptr++;
- to=strtol(ptr, &ptr2, 0);
- if(ptr == ptr2) {
-***************
-*** 886,892 ****
- if('(' == *bytes)
- break;
- /* if only skip digits, or else we're in deep trouble */
-! if(!isdigit(*bytes)) {
- bytes=NULL;
- break;
- }
---- 886,892 ----
- if('(' == *bytes)
- break;
- /* if only skip digits, or else we're in deep trouble */
-! if(!isdigit((int)*bytes)) {
- bytes=NULL;
- break;
- }
-Only in curl-6.3.1/lib: ftp.c~
-Binary files curl-6.3.1-org/lib/ftp.o and curl-6.3.1/lib/ftp.o differ
-diff -cr curl-6.3.1-org/lib/hostip.c curl-6.3.1/lib/hostip.c
-*** curl-6.3.1-org/lib/hostip.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/hostip.c Thu Dec 9 14:27:27 1999
-***************
-*** 40,46 ****
-
- #include <string.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 40,46 ----
-
- #include <string.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Binary files curl-6.3.1-org/lib/hostip.o and curl-6.3.1/lib/hostip.o differ
-diff -cr curl-6.3.1-org/lib/http.c curl-6.3.1/lib/http.c
-*** curl-6.3.1-org/lib/http.c Sat Oct 30 17:43:52 1999
---- curl-6.3.1/lib/http.c Thu Dec 9 14:27:27 1999
-***************
-*** 49,55 ****
-
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 49,55 ----
-
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Binary files curl-6.3.1-org/lib/http.o and curl-6.3.1/lib/http.o differ
-diff -cr curl-6.3.1-org/lib/if2ip.c curl-6.3.1/lib/if2ip.c
-*** curl-6.3.1-org/lib/if2ip.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/if2ip.c Thu Dec 9 14:27:28 1999
-***************
-*** 42,48 ****
- #include <stdlib.h>
- #include <string.h>
-
-! #include <curl/setup.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- 42,48 ----
- #include <stdlib.h>
- #include <string.h>
-
-! #include "setup.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -cr curl-6.3.1-org/lib/if2ip.h curl-6.3.1/lib/if2ip.h
-*** curl-6.3.1-org/lib/if2ip.h Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/if2ip.h Thu Dec 9 14:27:49 1999
-***************
-*** 39,45 ****
- *
- * ------------------------------------------------------------
- ****************************************************************************/
-! #include <curl/setup.h>
-
- #ifndef WIN32
- char *if2ip(char *interface);
---- 39,45 ----
- *
- * ------------------------------------------------------------
- ****************************************************************************/
-! #include "setup.h"
-
- #ifndef WIN32
- char *if2ip(char *interface);
-Binary files curl-6.3.1-org/lib/if2ip.o and curl-6.3.1/lib/if2ip.o differ
-diff -cr curl-6.3.1-org/lib/ldap.c curl-6.3.1/lib/ldap.c
-*** curl-6.3.1-org/lib/ldap.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/ldap.c Thu Dec 9 15:44:17 1999
-***************
-*** 48,54 ****
- #include <sys/stat.h>
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__)
- #else
---- 48,54 ----
- #include <sys/stat.h>
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__)
- #else
-***************
-*** 125,130 ****
---- 125,131 ----
- struct UrlData *data = (struct UrlData *)param;
-
- printf("%s\n", text);
-+ return 0;
- }
-
- /***********************************************************************
-***************
-*** 145,155 ****
---- 146,158 ----
- void *server;
- void *result;
- void *entryIterator;
-+ #if 0
- char *dn;
- char **attrArray;
- char *attrIterator;
- char *attrString;
- void *dummy;
-+ #endif
- int ldaptext;
-
- infof(data, "LDAP: %s %s\n", data->url);
-Only in curl-6.3.1/lib: ldap.c~
-Binary files curl-6.3.1-org/lib/ldap.o and curl-6.3.1/lib/ldap.o differ
-Binary files curl-6.3.1-org/lib/libcurl.a and curl-6.3.1/lib/libcurl.a differ
-diff -cr curl-6.3.1-org/lib/netrc.c curl-6.3.1/lib/netrc.c
-*** curl-6.3.1-org/lib/netrc.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/netrc.c Thu Dec 9 14:27:29 1999
-***************
-*** 54,60 ****
- #include <stdlib.h>
- #include <string.h>
-
-! #include <curl/setup.h>
- #include "getenv.h"
-
- /* Debug this single source file with:
---- 54,60 ----
- #include <stdlib.h>
- #include <string.h>
-
-! #include "setup.h"
- #include "getenv.h"
-
- /* Debug this single source file with:
-Binary files curl-6.3.1-org/lib/netrc.o and curl-6.3.1/lib/netrc.o differ
-diff -cr curl-6.3.1-org/lib/progress.c curl-6.3.1/lib/progress.c
-*** curl-6.3.1-org/lib/progress.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/progress.c Thu Dec 9 14:27:29 1999
-***************
-*** 39,45 ****
- ****************************************************************************/
-
- #include <string.h>
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #if defined(__MINGW32__)
---- 39,45 ----
- ****************************************************************************/
-
- #include <string.h>
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #if defined(__MINGW32__)
-***************
-*** 56,77 ****
- /* --- start of progress routines --- */
- int progressmax=-1;
-
-- static int progressmode=0;
- static int prev = 0;
- static int width = 0;
-
-- void ProgressMode(int mode)
-- {
-- progressmode=mode;
-- }
--
- void ProgressInit(struct UrlData *data, int max)
- {
-! static char beenhere=0;
-!
-! if(beenhere || (data->conf&(CONF_NOPROGRESS|CONF_MUTE)))
- return;
-! /*beenhere=1;*/
- prev = 0;
-
- /* TODO: get terminal width through ansi escapes or something similar.
---- 56,69 ----
- /* --- start of progress routines --- */
- int progressmax=-1;
-
- static int prev = 0;
- static int width = 0;
-
- void ProgressInit(struct UrlData *data, int max)
- {
-! if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
- return;
-!
- prev = 0;
-
- /* TODO: get terminal width through ansi escapes or something similar.
-***************
-*** 89,95 ****
- return;
- }
-
-! if ( progressmode == URG_PROGRESS_MODE_STATS )
- fprintf(stderr, " %% Received Total Speed Time left Total Curr.Speed\n");
- }
-
---- 81,87 ----
- return;
- }
-
-! if ( data->progressmode == CURL_PROGRESS_STATS )
- fprintf(stderr, " %% Received Total Speed Time left Total Curr.Speed\n");
- }
-
-***************
-*** 104,111 ****
- void ProgressShow(struct UrlData *data,
- int point, struct timeval start, struct timeval now, bool force)
- {
-! switch ( progressmode ) {
-! case URG_PROGRESS_MODE_STATS:
- {
- static long lastshow;
- double percen;
---- 96,103 ----
- void ProgressShow(struct UrlData *data,
- int point, struct timeval start, struct timeval now, bool force)
- {
-! switch ( data->progressmode ) {
-! case CURL_PROGRESS_STATS:
- {
- static long lastshow;
- double percen;
-***************
-*** 172,178 ****
- lastshow = now.tv_sec;
- break;
- }
-! case URG_PROGRESS_MODE_BAR: /* 19990617 larsa */
- {
- if (point == prev) break;
- if (progressmax == -1) {
---- 164,170 ----
- lastshow = now.tv_sec;
- break;
- }
-! case CURL_PROGRESS_BAR: /* 19990617 larsa */
- {
- if (point == prev) break;
- if (progressmax == -1) {
-Only in curl-6.3.1/lib: progress.c~
-diff -cr curl-6.3.1-org/lib/progress.h curl-6.3.1/lib/progress.h
-*** curl-6.3.1-org/lib/progress.h Mon Sep 6 08:59:41 1999
---- curl-6.3.1/lib/progress.h Thu Dec 9 14:27:50 1999
-***************
-*** 51,58 ****
- /* Don't show progress for sizes smaller than: */
- #define LEAST_SIZE_PROGRESS BUFSIZE
-
-- /* we want more progress info modes... */
-- #define URG_PROGRESS_MODE_STATS (0) /* default is the mode with value 0 */
-- #define URG_PROGRESS_MODE_BAR (1)
--
- #endif /* __PROGRESS_H */
---- 51,54 ----
-Only in curl-6.3.1/lib: progress.h~
-Binary files curl-6.3.1-org/lib/progress.o and curl-6.3.1/lib/progress.o differ
-Only in curl-6.3.1/lib: replace.sh
-Only in curl-6.3.1/lib: replace.sh~
-diff -cr curl-6.3.1-org/lib/sendf.c curl-6.3.1/lib/sendf.c
-*** curl-6.3.1-org/lib/sendf.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/sendf.c Thu Dec 9 14:27:30 1999
-***************
-*** 42,48 ****
- #include <stdarg.h>
- #include <stdlib.h>
-
-! #include <curl/setup.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- 42,48 ----
- #include <stdarg.h>
- #include <stdlib.h>
-
-! #include "setup.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Binary files curl-6.3.1-org/lib/sendf.o and curl-6.3.1/lib/sendf.o differ
-Only in curl-6.3.1/lib: setup.h
-Only in curl-6.3.1/lib: setup.h~
-diff -cr curl-6.3.1-org/lib/speedcheck.h curl-6.3.1/lib/speedcheck.h
-*** curl-6.3.1-org/lib/speedcheck.h Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/speedcheck.h Thu Dec 9 14:27:50 1999
-***************
-*** 40,46 ****
- * ------------------------------------------------------------
- ****************************************************************************/
-
-! #include <curl/setup.h>
-
- #include "timeval.h"
-
---- 40,46 ----
- * ------------------------------------------------------------
- ****************************************************************************/
-
-! #include "setup.h"
-
- #include "timeval.h"
-
-Binary files curl-6.3.1-org/lib/speedcheck.o and curl-6.3.1/lib/speedcheck.o differ
-diff -cr curl-6.3.1-org/lib/ssluse.c curl-6.3.1/lib/ssluse.c
-*** curl-6.3.1-org/lib/ssluse.c Mon Sep 6 08:59:41 1999
---- curl-6.3.1/lib/ssluse.c Thu Dec 9 14:27:30 1999
-***************
-*** 133,138 ****
---- 133,152 ----
-
- #endif
-
-+ #if SSL_VERIFY_CERT
-+ int cert_verify_callback(int ok, X509_STORE_CTX *ctx)
-+ {
-+ X509 *err_cert;
-+ char buf[256];
-+
-+ err_cert=X509_STORE_CTX_get_current_cert(ctx);
-+ X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
-+
-+ return 1;
-+ }
-+
-+ #endif
-+
- /* ====================================================== */
- int
- UrgSSLConnect (struct UrlData *data)
-***************
-*** 176,182 ****
- return 2;
- }
- }
-! /* Lets make a SSL structure */
- data->ssl = SSL_new (data->ctx);
- SSL_set_connect_state (data->ssl);
-
---- 190,204 ----
- return 2;
- }
- }
-!
-! #if SSL_VERIFY_CERT
-! SSL_CTX_set_verify(data->ctx,
-! SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT|
-! SSL_VERIFY_CLIENT_ONCE,
-! cert_verify_callback);
-! #endif
-!
-! /* Lets make an SSL structure */
- data->ssl = SSL_new (data->ctx);
- SSL_set_connect_state (data->ssl);
-
-***************
-*** 227,232 ****
---- 249,261 ----
- /* We could do all sorts of certificate verification stuff here before
- deallocating the certificate. */
-
-+
-+ #if SSL_VERIFY_CERT
-+ infof(data, "Verify result: %d\n", SSL_get_verify_result(data->ssl));
-+ #endif
-+
-+
-+
- X509_free (data->server_cert);
- #else /* USE_SSLEAY */
- /* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
-Only in curl-6.3.1/lib: ssluse.c~
-Binary files curl-6.3.1-org/lib/ssluse.o and curl-6.3.1/lib/ssluse.o differ
-diff -cr curl-6.3.1-org/lib/telnet.c curl-6.3.1/lib/telnet.c
-*** curl-6.3.1-org/lib/telnet.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/telnet.c Thu Dec 9 14:27:31 1999
-***************
-*** 57,63 ****
-
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 57,63 ----
-
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-Binary files curl-6.3.1-org/lib/telnet.o and curl-6.3.1/lib/telnet.o differ
-diff -cr curl-6.3.1-org/lib/timeval.h curl-6.3.1/lib/timeval.h
-*** curl-6.3.1-org/lib/timeval.h Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/timeval.h Thu Dec 9 14:27:51 1999
-***************
-*** 46,52 ****
- #include <sys/time.h>
- #endif
-
-! #include <curl/setup.h>
-
- #ifndef HAVE_GETTIMEOFDAY
- #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)
---- 46,52 ----
- #include <sys/time.h>
- #endif
-
-! #include "setup.h"
-
- #ifndef HAVE_GETTIMEOFDAY
- #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)
-Binary files curl-6.3.1-org/lib/timeval.o and curl-6.3.1/lib/timeval.o differ
-diff -cr curl-6.3.1-org/lib/upload.c curl-6.3.1/lib/upload.c
-*** curl-6.3.1-org/lib/upload.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/upload.c Thu Dec 9 14:27:32 1999
-***************
-*** 38,44 ****
- * ------------------------------------------------------------
- ****************************************************************************/
-
-! #include <curl/setup.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
---- 38,44 ----
- * ------------------------------------------------------------
- ****************************************************************************/
-
-! #include "setup.h"
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-Binary files curl-6.3.1-org/lib/upload.o and curl-6.3.1/lib/upload.o differ
-diff -cr curl-6.3.1-org/lib/url.c curl-6.3.1/lib/url.c
-*** curl-6.3.1-org/lib/url.c Fri Nov 19 08:07:10 1999
---- curl-6.3.1/lib/url.c Thu Dec 9 14:27:32 1999
-***************
-*** 54,60 ****
-
- #include <errno.h>
-
-! #include <curl/setup.h>
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
---- 54,60 ----
-
- #include <errno.h>
-
-! #include "setup.h"
-
- #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
- #include <winsock.h>
-***************
-*** 387,392 ****
---- 387,395 ----
- case URGTAG_POSTFIELDS:
- data->postfields = (char *)param_obj;
- break;
-+ case URGTAG_PROGRESSMODE:
-+ data->progressmode = (long)param_long;
-+ break;
- case URGTAG_REFERER:
- data->referer = (char *)param_obj;
- break;
-Only in curl-6.3.1/lib: url.c~
-Binary files curl-6.3.1-org/lib/url.o and curl-6.3.1/lib/url.o differ
-diff -cr curl-6.3.1-org/lib/urldata.h curl-6.3.1/lib/urldata.h
-*** curl-6.3.1-org/lib/urldata.h Sat Oct 30 17:44:42 1999
---- curl-6.3.1/lib/urldata.h Thu Dec 9 14:27:52 1999
-***************
-*** 42,48 ****
-
- /* This file is for lib internal stuff */
-
-! #include <curl/setup.h>
-
- #ifndef MAXHOSTNAMELEN
- #define MAXHOSTNAMELEN 256
---- 42,48 ----
-
- /* This file is for lib internal stuff */
-
-! #include "setup.h"
-
- #ifndef MAXHOSTNAMELEN
- #define MAXHOSTNAMELEN 256
-***************
-*** 184,189 ****
---- 184,190 ----
-
- char *headerbuff; /* allocated buffer to store headers in */
- int headersize; /* size of the allocation */
-+ int progressmode; /* what kind of progress meter to display */
-
- #define MAX_CURL_USER_LENGTH 128
- #define MAX_CURL_PASSWORD_LENGTH 128
-Only in curl-6.3.1/lib: urldata.h~
-diff -cr curl-6.3.1-org/lib/version.c curl-6.3.1/lib/version.c
-*** curl-6.3.1-org/lib/version.c Thu Oct 14 00:27:12 1999
---- curl-6.3.1/lib/version.c Thu Dec 9 14:27:32 1999
-***************
-*** 41,47 ****
- #include <string.h>
- #include <stdio.h>
-
-! #include <curl/setup.h>
- #include <curl/curl.h>
- #include "urldata.h"
-
---- 41,47 ----
- #include <string.h>
- #include <stdio.h>
-
-! #include "setup.h"
- #include <curl/curl.h>
- #include "urldata.h"
-
-Binary files curl-6.3.1-org/lib/version.o and curl-6.3.1/lib/version.o differ
-diff -cr curl-6.3.1-org/src/Makefile curl-6.3.1/src/Makefile
-*** curl-6.3.1-org/src/Makefile Wed Dec 8 13:39:41 1999
---- curl-6.3.1/src/Makefile Thu Dec 9 14:47:51 1999
-***************
-*** 97,107 ****
-
-
- DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-! LDFLAGS =
-! LIBS = -ldl -lsocket -lnsl
- curl_OBJECTS = main.o hugehelp.o urlglob.o
- curl_LDFLAGS =
-! CFLAGS = -g -O2
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
---- 97,107 ----
-
-
- DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-! LDFLAGS = -L/homes/qradlsg/openssl-0.9.4
-! LIBS = -lssl -lcrypto -ldl -lsocket -lnsl
- curl_OBJECTS = main.o hugehelp.o urlglob.o
- curl_LDFLAGS =
-! CFLAGS = -g -O2 -Wall
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-diff -cr curl-6.3.1-org/src/Makefile.in curl-6.3.1/src/Makefile.in
-*** curl-6.3.1-org/src/Makefile.in Wed Dec 8 13:38:21 1999
---- curl-6.3.1/src/Makefile.in Thu Dec 9 14:40:07 1999
-***************
-*** 101,107 ****
- LIBS = @LIBS@
- curl_OBJECTS = main.o hugehelp.o urlglob.o
- curl_LDFLAGS =
-! CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
---- 101,107 ----
- LIBS = @LIBS@
- curl_OBJECTS = main.o hugehelp.o urlglob.o
- curl_LDFLAGS =
-! CFLAGS = @CFLAGS@ -Wall
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-Only in curl-6.3.1/src: Makefile.in~
-Only in curl-6.3.1/src: config-win32.h
-Only in curl-6.3.1/src: config-win32.h~
-Only in curl-6.3.1/src: config.h
-Only in curl-6.3.1/src: config.h.in
-Only in curl-6.3.1/src: config.h.in~
-Only in curl-6.3.1/src: curl
-Only in curl-6.3.1/src: hugehelp.c
-Binary files curl-6.3.1-org/src/hugehelp.o and curl-6.3.1/src/hugehelp.o differ
-diff -cr curl-6.3.1-org/src/main.c curl-6.3.1/src/main.c
-*** curl-6.3.1-org/src/main.c Sat Oct 30 17:45:12 1999
---- curl-6.3.1/src/main.c Thu Dec 9 14:50:12 1999
-***************
-*** 45,53 ****
- #include <sys/stat.h>
- #include <ctype.h>
-
-! #include "curl/setup.h"
-! #include "curl/curl.h"
-! #include "curl/mprintf.h"
- #include "../lib/getdate.h"
- #ifdef GLOBURL
- #include "urlglob.h"
---- 45,52 ----
- #include <sys/stat.h>
- #include <ctype.h>
-
-! #include <curl/curl.h>
-! #include <curl/mprintf.h>
- #include "../lib/getdate.h"
- #ifdef GLOBURL
- #include "urlglob.h"
-***************
-*** 54,71 ****
- #define CURLseparator "--_curl_--"
- #define MIMEseparator "_curl_"
- #endif
- #include "version.h"
-
-! #ifdef WIN32
- #include <io.h>
-! #else
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-- #endif
-
- extern void hugehelp(void);
-- extern void ProgressMode(int);
-
- static void helpf(char *fmt, ...)
- {
---- 53,73 ----
- #define CURLseparator "--_curl_--"
- #define MIMEseparator "_curl_"
- #endif
-+
-+ /* This is now designed to have its own local setup.h */
-+ #include "setup.h"
-+
- #include "version.h"
-
-! #ifdef HAVE_IO_H /* typical win32 habit */
- #include <io.h>
-! #endif
-!
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-
- extern void hugehelp(void);
-
- static void helpf(char *fmt, ...)
- {
-***************
-*** 173,178 ****
---- 175,181 ----
- bool crlf;
- char *cookiefile;
- char *httprequest;
-+ bool progressmode;
-
- FILE *errors; /* if stderr redirect is requested */
-
-***************
-*** 412,419 ****
- else
- config->errors = stdout;
- break;
-! case '#': /* 19990617 larsa */
-! ProgressMode(1);
- break;
- case '2':
- /* SSL version 2 */
---- 415,422 ----
- else
- config->errors = stdout;
- break;
-! case '#': /* added 19990617 larsa */
-! config->progressmode ^= CURL_PROGRESS_BAR;
- break;
- case '2':
- /* SSL version 2 */
-***************
-*** 833,839 ****
- int infilesize=-1; /* -1 means unknown */
- bool stillflags=TRUE;
-
-! int res;
- int i;
- struct Configurable config;
-
---- 836,842 ----
- int infilesize=-1; /* -1 means unknown */
- bool stillflags=TRUE;
-
-! int res=URG_OK;
- int i;
- struct Configurable config;
-
-***************
-*** 937,943 ****
- printf("Content-Type: multipart/mixed; boundary=%s\n\n", MIMEseparator);
- #endif
- }
-! for (i = 0; url = next_url(urls); ++i) {
- if (outfiles)
- config.outfile = strdup(outfiles);
- #endif
---- 940,946 ----
- printf("Content-Type: multipart/mixed; boundary=%s\n\n", MIMEseparator);
- #endif
- }
-! for (i = 0; (url = next_url(urls)); ++i) {
- if (outfiles)
- config.outfile = strdup(outfiles);
- #endif
-***************
-*** 1105,1116 ****
- URGTAG_CRLF, config.crlf,
- URGTAG_QUOTE, config.quote,
- URGTAG_WRITEHEADER, headerfilep,
--
- URGTAG_COOKIEFILE, config.cookiefile,
- URGTAG_SSLVERSION, config.ssl_version,
- URGTAG_TIMECONDITION, config.timecond,
- URGTAG_TIMEVALUE, config.condtime,
- URGTAG_HTTPREQUEST, config.httprequest,
- URGTAG_DONE); /* always terminate the list of tags */
- if(!config.errors)
- config.errors = stderr;
---- 1108,1119 ----
- URGTAG_CRLF, config.crlf,
- URGTAG_QUOTE, config.quote,
- URGTAG_WRITEHEADER, headerfilep,
- URGTAG_COOKIEFILE, config.cookiefile,
- URGTAG_SSLVERSION, config.ssl_version,
- URGTAG_TIMECONDITION, config.timecond,
- URGTAG_TIMEVALUE, config.condtime,
- URGTAG_HTTPREQUEST, config.httprequest,
-+ URGTAG_PROGRESSMODE, config.progressmode,
- URGTAG_DONE); /* always terminate the list of tags */
- if(!config.errors)
- config.errors = stderr;
-Only in curl-6.3.1/src: main.c~
-Binary files curl-6.3.1-org/src/main.o and curl-6.3.1/src/main.o differ
-Only in curl-6.3.1/src: setup.h
-Only in curl-6.3.1/src: setup.h~
-Only in curl-6.3.1/src: stamp-h2
-diff -cr curl-6.3.1-org/src/urlglob.c curl-6.3.1/src/urlglob.c
-*** curl-6.3.1-org/src/urlglob.c Thu Oct 14 00:28:43 1999
---- curl-6.3.1/src/urlglob.c Wed Dec 8 16:55:55 1999
-***************
-*** 41,46 ****
---- 41,47 ----
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+ #include <ctype.h>
- #include <curl/curl.h>
- #include "urlglob.h"
-
-***************
-*** 117,123 ****
- - num range with leading zeros: e.g. "001-999]"
- expression is checked for well-formedness and collected until the next ']'
- */
-- char* buf = glob_buffer;
- URLPattern *pat;
- char *c;
-
---- 118,123 ----
-***************
-*** 125,131 ****
- /* patterns 0,1,2,... correspond to size=1,3,5,... */
- ++glob_expand->size;
-
-! if (isalpha(*pattern)) { /* character range detected */
- pat->type = UPTCharRange;
- if (sscanf(pattern, "%c-%c]", &pat->content.CharRange.min_c, &pat->content.CharRange.max_c) != 2 ||
- pat->content.CharRange.min_c >= pat->content.CharRange.max_c ||
---- 125,131 ----
- /* patterns 0,1,2,... correspond to size=1,3,5,... */
- ++glob_expand->size;
-
-! if (isalpha((int)*pattern)) { /* character range detected */
- pat->type = UPTCharRange;
- if (sscanf(pattern, "%c-%c]", &pat->content.CharRange.min_c, &pat->content.CharRange.max_c) != 2 ||
- pat->content.CharRange.min_c >= pat->content.CharRange.max_c ||
-***************
-*** 139,145 ****
- return (pat->content.CharRange.max_c - pat->content.CharRange.min_c + 1) *
- glob_word(pattern + 4, pos + 4);
- }
-! if (isdigit(*pattern)) { /* numeric range detected */
- pat->type = UPTNumRange;
- pat->content.NumRange.padlength = 0;
- if (sscanf(pattern, "%d-%d]", &pat->content.NumRange.min_n, &pat->content.NumRange.max_n) != 2 ||
---- 139,145 ----
- return (pat->content.CharRange.max_c - pat->content.CharRange.min_c + 1) *
- glob_word(pattern + 4, pos + 4);
- }
-! if (isdigit((int)*pattern)) { /* numeric range detected */
- pat->type = UPTNumRange;
- pat->content.NumRange.padlength = 0;
- if (sscanf(pattern, "%d-%d]", &pat->content.NumRange.min_n, &pat->content.NumRange.max_n) != 2 ||
-***************
-*** 150,156 ****
- }
- if (*pattern == '0') { /* leading zero specified */
- c = pattern;
-! while (isdigit(*c++))
- ++pat->content.NumRange.padlength; /* padding length is set for all instances
- of this pattern */
- }
---- 150,156 ----
- }
- if (*pattern == '0') { /* leading zero specified */
- c = pattern;
-! while (isdigit((int)*c++))
- ++pat->content.NumRange.padlength; /* padding length is set for all instances
- of this pattern */
- }
-***************
-*** 296,302 ****
-
- while (*filename != '\0') {
- if (*filename == '#') {
-! if (!isdigit(*++filename) ||
- *filename == '0') { /* only '#1' ... '#9' allowed */
- printf("illegal matching expression\n");
- exit(URG_URL_MALFORMAT);
---- 296,302 ----
-
- while (*filename != '\0') {
- if (*filename == '#') {
-! if (!isdigit((int)*++filename) ||
- *filename == '0') { /* only '#1' ... '#9' allowed */
- printf("illegal matching expression\n");
- exit(URG_URL_MALFORMAT);
-Only in curl-6.3.1/src: urlglob.c~
-Binary files curl-6.3.1-org/src/urlglob.o and curl-6.3.1/src/urlglob.o differ
+++ /dev/null
-*** /homes/qradlsg/curl-org/lib/formdata.c Thu Oct 14 00:27:12 1999
---- formdata.c Mon Nov 22 16:55:20 1999
-***************
-*** 41,47 ****
- /*
- Debug the form generator stand-alone by compiling this source file with:
-
-! 'make formdata'
-
- run the 'formdata' executable and make sure the output is ok!
-
---- 41,47 ----
- /*
- Debug the form generator stand-alone by compiling this source file with:
-
-! gcc -DHAVE_CONFIG_H -I../ -g -D_FORM_DEBUG -o formdata -I../include formdata.c
-
- run the 'formdata' executable and make sure the output is ok!
-
-***************
-*** 313,320 ****
- if(!length)
- length = strlen((char *)line);
-
-! newform->line = (char *)malloc(length);
-! memcpy(newform->line, line, length);
- newform->length = length;
-
- if(*formp) {
---- 313,320 ----
- if(!length)
- length = strlen((char *)line);
-
-! newform->line = (char *)malloc(length+1);
-! memcpy(newform->line, line, length+1);
- newform->length = length;
-
- if(*formp) {
-***************
-*** 499,504 ****
---- 499,505 ----
- size += AddFormDataf(&form,
- "\r\n--%s--",
- fileboundary);
-+ free(fileboundary);
- }
-
- } while((post=post->next)); /* for each field */
-***************
-*** 511,518 ****
- *sizep = size;
-
- free(boundary);
-- if(fileboundary)
-- free(fileboundary);
-
- return firstform;
- }
---- 512,517 ----
-***************
-*** 572,577 ****
---- 571,583 ----
-
- form->data = form->data->next; /* advance */
-
-+ if(!gotsize && form->data) {
-+ /* If we got an empty line and we have more data, we proceed to the next
-+ line immediately to avoid returning zero before we've reached the end.
-+ This is the bug reported November 22 1999 on curl 6.3. (Daniel) */
-+ gotsize = FormReader(buffer, size, nitems, mydata);
-+ }
-+
- return gotsize;
- }
-
-***************
-*** 615,621 ****
- FormInit(&formread, form);
-
- while(nread = FormReader(buffer, 1, sizeof(buffer), (FILE *)&formread)) {
-! fwrite(buffer, nread, 1, stdout);
- }
-
- fprintf(stderr, "size: %d\n", size);
---- 621,627 ----
- FormInit(&formread, form);
-
- while(nread = FormReader(buffer, 1, sizeof(buffer), (FILE *)&formread)) {
-! fwrite(buffer, nread, 1, stderr);
- }
-
- fprintf(stderr, "size: %d\n", size);
+++ /dev/null
-*** /homes/qradlsg/curl-org/lib/download.c Thu Nov 11 08:57:12 1999
---- lib/download.c Mon Nov 22 08:33:13 1999
-***************
-*** 455,461 ****
- #endif
- }
- }
-!
- ProgressShow (data, bytecount, start, now, TRUE);
-
- *bytecountp = bytecount;
---- 455,464 ----
- #endif
- }
- }
-! if(contentlength && (bytecount != contentlength)) {
-! failf(data, "transfer closed with %d bytes remaining", contentlength-bytecount);
-! return URG_PARTIAL_FILE;
-! }
- ProgressShow (data, bytecount, start, now, TRUE);
-
- *bytecountp = bytecount;
-*** /homes/qradlsg/curl-org/include/curl/curl.h Thu Nov 11 21:58:02 1999
---- include/curl/curl.h Mon Nov 22 08:33:59 1999
-***************
-*** 159,165 ****
- URG_FTP_CANT_GET_HOST,
- URG_FTP_CANT_RECONNECT,
- URG_FTP_COULDNT_SET_BINARY,
-! URG_FTP_PARTIAL_FILE,
- URG_FTP_COULDNT_RETR_FILE,
- URG_FTP_WRITE_ERROR,
- URG_FTP_QUOTE_ERROR,
---- 159,165 ----
- URG_FTP_CANT_GET_HOST,
- URG_FTP_CANT_RECONNECT,
- URG_FTP_COULDNT_SET_BINARY,
-! URG_PARTIAL_FILE,
- URG_FTP_COULDNT_RETR_FILE,
- URG_FTP_WRITE_ERROR,
- URG_FTP_QUOTE_ERROR,
-***************
-*** 197,202 ****
---- 197,205 ----
- URL_LAST
- } UrgError;
-
-+ /* This is just to make older programs not break: */
-+ #define URG_FTP_PARTIAL_FILE URG_PARTIAL_FILE
-+
- #define URGTAG_DONE -1
- #define URGTAG_LAST -1
- #define URGTAG_END -1
-*** /homes/qradlsg/curl-org/lib/ftp.c Sat Oct 30 17:43:25 1999
---- lib/ftp.c Mon Nov 22 08:34:27 1999
-***************
-*** 707,713 ****
- if((-1 != data->infilesize) && (data->infilesize != *bytecountp)) {
- failf(data, "Wrote only partial file (%d out of %d bytes)",
- *bytecountp, data->infilesize);
-! return URG_FTP_PARTIAL_FILE;
- }
- }
- else {
---- 707,713 ----
- if((-1 != data->infilesize) && (data->infilesize != *bytecountp)) {
- failf(data, "Wrote only partial file (%d out of %d bytes)",
- *bytecountp, data->infilesize);
-! return URG_PARTIAL_FILE;
- }
- }
- else {
-***************
-*** 908,914 ****
- if(size <= 0) {
- failf(data, "Offset (%d) was beyond file size (%d)",
- data->resume_from, data->resume_from+size);
-! return URG_FTP_PARTIAL_FILE;
- }
- }
- #endif
---- 908,914 ----
- if(size <= 0) {
- failf(data, "Offset (%d) was beyond file size (%d)",
- data->resume_from, data->resume_from+size);
-! return URG_PARTIAL_FILE;
- }
- }
- #endif
-***************
-*** 929,935 ****
-
- if((-1 != size) && (size != *bytecountp)) {
- failf(data, "Received only partial file");
-! return URG_FTP_PARTIAL_FILE;
- }
- else if(0 == *bytecountp) {
- failf(data, "No data was received!");
---- 929,935 ----
-
- if((-1 != size) && (size != *bytecountp)) {
- failf(data, "Received only partial file");
-! return URG_PARTIAL_FILE;
- }
- else if(0 == *bytecountp) {
- failf(data, "No data was received!");
projects / thirdparty / curl.git / commitdiff
