7.2 cleanup commit

that a long time ago...!

FAQ

@@ -1,59 +0,0 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
-                             \___|\___/|_| \_\_____|
-
-FAQ
-
-Problems connecting to SSL servers.
-===================================
-
-  It took a very long time before I could sort out why curl had problems
-  to connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.
-  The error sometimes showed up similar to:
-
-  16570:error:1407D071:SSL routines:SSL2_READ:bad mac decode:s2_pkt.c:233:
-
-  It turned out to be because many older SSL servers don't deal with SSLv3
-  requests properly. To correct this problem, tell curl to select SSLv2 from
-  the command line (-2/--sslv2).
-
-  I have also seen examples where the remote server didn't like the SSLv2
-  request and instead you had to force curl to use SSLv3 with -3/--sslv3.
-
-Does curl support resume?
-=========================
-
-  Yes. Both ways on FTP, download ways on HTTP.
-
-Is libcurl thread safe?
-=======================
-
-  Yes, as far as curl's own code goes. It does use system calls that often
-  aren't thread safe in most environments, such as gethostbyname().
-
-  I am very interested in once and for all getting some kind of report or
-  README file from those who have used libcurl in a threaded environment,
-  since I haven't and I get this question more and more frequently!
-
-Why doesn't my posting using -F work?
-=====================================
-
-  You can't simply use -F or -d at your choice. The web server that will
-  receive your post assumes one of the formats. If the form you're trying to
-  "fake" sets the type to 'multipart/form-data', than and only then you must
-  use the -F type. In all the most common cases, you should use -d which then
-  causes a posting with the type 'application/x-www-form-urlencoded'.
-
-Does curl support custom FTP commands?
-======================================
-
-  Yes it does, you can tell curl to perform optional commands both before
-  and/or after a file transfer. Study the -Q/--quote option.
-
-  Since curl is used for file transfers, you don't use curl to just perform
-  ftp commands without transfering anything. Therefore you must always specify
-  a URL to transfer to/from even when doing custom FTP commands.
-
-  

FILES

@@ -1,23 +1,31 @@
-BUGS
 CHANGES
-CONTRIBUTE
-FEATURES
-FAQ
 FILES
-INSTALL
 LEGAL
 MPL-1.0.txt
 README
-README.curl
-README.libcurl
-curl.1
 *spec
-RESOURCES
-TODO
+*spec.in
+docs/BUGS
+docs/CONTRIBUTE
+docs/FAQ
+docs/FEATURES
+docs/INSTALL
+docs/INTERNALS
+docs/README.curl
+docs/README.win32
+docs/README.libcurl
+docs/RESOURCES
+docs/TODO
+docs/curl.1
+docs/Makefile.in
+docs/Makefile.am
+docs/TheArtOfHttpScripting
+docs/*.3
 maketgz
 Makefile.in
 Makefile.am
 acconfig.h
+acinclude.m4
 aclocal.m4
 config.guess
 config.h.in
@@ -30,6 +38,8 @@ missing
 mkinstalldirs
 reconf
 stamp-h.in
+ltconfig
+ltmain.sh
 src/*.[ch]
 src/*in
 src/*am
@@ -43,5 +53,9 @@ lib/*am
 lib/Makefile.vc6
 lib/*m32
 include/README
+include/Makefile.in
+include/Makefile.am
 include/curl/*.h
+include/curl/Makefile.in
+include/curl/Makefile.am
 

LEGAL

@@ -14,8 +14,8 @@ Regulation" the following exemptions apply to this software:
 
 Initial Developers of this software are:
 
-  Daniel Stenberg <Daniel.Stenberg@sth.frontec.se>
-  Rafael Linden Sagula <sagula@inf.ufrgs.br>
+  Daniel Stenberg <daniel@haxx.se>
+
+Curl is Copyright (C) 1996-2000 Daniel Stenberg
 
-Curl is Copyright (C) 1996-1998 Daniel Stenberg and Rafael Linden Sagula
  

Makefile.am

@@ -4,10 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-man_MANS = curl.1
-
-EXTRA_DIST = $(man_MANS)
-
-SUBDIRS = lib src
+EXTRA_DIST = curl.spec curl-ssl.spec
 
+SUBDIRS = docs lib src include
 

Makefile.dist

@@ -24,9 +24,9 @@
 #
 # ------------------------------------------------------------
 # Main author:
-# - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+# - Daniel Stenberg <daniel@haxx.se>
 #
-# 	http://curl.haxx.nu
+# 	http://curl.haxx.se
 #
 # $Source$
 # $Revision$

README

@@ -11,7 +11,7 @@ README
   README.curl document. Find out how to install Curl by reading the INSTALL
   document.
 
-  libcurl is a link-library that Curl is using to do its job. It is readily
+  libcurl is a library that Curl is using to do its job. It is readily
   available to be used by your software. Read the README.libcurl document to
   find out how!
 
@@ -19,13 +19,12 @@ README
 
   Always try the Curl web site for the latest news:
 
-        http://curl.haxx.nu
+        http://curl.haxx.se
 
   The official download mirror sites are:
 
         Sweden --  ftp://ftp.sunet.se/pub/www/utilities/curl/
         Germany -- ftp://ftp.fu-berlin.de/pub/unix/network/curl/
-        China --   http://www.pshowing.com/curl/
 
   To download the very latest source off the CVS server do this:
 
@@ -36,7 +35,7 @@ README
         cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl co .
 
      (now, you'll get all the latest sources downloaded into your current
-        directory. Note that this does not create a directory named curl or
+     directory. Note that this does NOT create a directory named curl or
      anything)
 
         cvs -d :pserver:anonymous@cvs.curl.sourceforge.net:/cvsroot/curl logout

README.libcurl

@@ -1,108 +0,0 @@
-                         _ _ _                     _ 
-                        | (_) |__   ___ _   _ _ __| |
-                        | | | '_ \ / __| | | | '__| |
-                        | | | |_) | (__| |_| | |  | |
-                        |_|_|_.__/ \___|\__,_|_|  |_|
-
-
-                     How To Use Libcurl In Your Program:
-                                 (by Ralph Beckmann <rabe@uni-paderborn.de>)
-
-NOTE: If you plan to use libcurl.a in Threads under Linux, do not use the old
-gcc-2.7.x because the function 'gethostbyname' seems not to be thread-safe,
-that is to say an unavoidable SEGMENTATION FAULT might occur.
-
-
-1. a) In a C-Program:
-      #include "curl.h"
-   
-   b) In a C++-Program:
-      extern "C" {
-      #include "curl.h"
-      }
- 
-2. char *url="http://www.domain.com";
-   curl_urlget (URGTAG_URL, url, 
-          URGTAG_FLAGS, CONF_NOPROGRESS,
-          URGTAG_ERRORBUFFER, errorBuffer,
-          URGTAG_WRITEFUNCTION, (size_t (*)(void *, int, int, FILE
-*))handle_data,
-          URGTAG_TIMEOUT, 30,         /* or anything You want             */
-   ...
-          URGTAG_DONE);
-
-3. size_t handle_data (const void *ptr, size_t size, size_t nitems,
-                       FILE *stream)
-   {
-      (void)stream;                   /* stop complaining using g++ -Wall */
-      if ((int)nitems <= 0) {
-         return (size_t)0;
-      }
-      fprintf(stdout, (char *)ptr);   /* or do anything else with it      */
-      return nitems;
-   }
-
-4. Compile Your Program with  -I$(CURL_DIR)/include
-
-5. Link Your Program together with  $(CURL_DIR)/lib/libcurl.a
-
-                     Small Example of How To Use libcurl
-
-----------------------------------------------------------------------
-/* Full example that uses libcurl.a to fetch web pages.                    */
-/* curlthreads.c                                                           */
-/* - Test-Program by Ralph Beckmann for using curl in POSIX-Threads        */
-/* Change *url1 and *url2 to textual long and slow non-FRAMESET websites!  */
-/* 
-   1. Compile with gcc or g++ as $(CC): 
-       $(CC) -c -Wall -pedantic curlthreads.c -I$(CURL_DIR)/include
-
-   2. Link with:
-      - Linux:
-        $(CC) -o curlthreads curlthreads.o $(CURL_DIR)/lib/libcurl.a -lpthread
--lm 
-      - Solaris:
-        $(CC) -o curlthreads curlthreads.o $(CURL_DIR)/lib/libcurl.a -lpthread
--lm -lsocket -lnsl
-*/
-
-#include <pthread.h> 
-#include <stdio.h>
-#ifdef __cplusplus
-extern "C" {
-#include "curl.h"
-}
-#else
-#include "curl.h"
-#endif
-
-size_t storedata (const void *ptr, size_t size, size_t nitems, FILE *stream) {
-  (void)ptr; (void)stream;            /* just to stop g++ -Wall complaining */
-  fprintf(stdout, "Thread #%i reads %i Bytes.\n", 
-                   (int)pthread_self(), (int)(nitems*size));
-  return (nitems);
-}
-
-void *urlfetcher(void *url) {
-  curl_urlget (URGTAG_URL,            url, 
-               URGTAG_FLAGS,          CONF_NOPROGRESS | CONF_FAILONERROR,
-               URGTAG_WRITEFUNCTION,  (size_t (*)(void *, int, int, FILE
-*))storedata,
-               URGTAG_DONE);
-  return NULL; 
-}
-
-int main(void) {
-  char *url1="www.sun.com";  
-  char *url2="www.microsoft.com";
-
-  pthread_t thread_id1, thread_id2;
-  pthread_create(&thread_id1, NULL, urlfetcher, (void *)url1);
-  pthread_create(&thread_id2, NULL, urlfetcher, (void *)url2);
-  pthread_join(thread_id1, NULL);
-  pthread_join(thread_id2, NULL);
- 
-  fprintf(stdout, "Ready.\n");
-
-  return 0;
-}

acconfig.h

@@ -10,3 +10,26 @@
 /* Define cpu-machine-OS */
 #undef OS
 
+/* Define if you have the gethostbyaddr_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* Define if you have the gethostbyaddr_r() function with 7 arguments */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* Define if you have the gethostbyaddr_r() function with 8 arguments */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define if you have the gethostbyname_r() function with 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* Define if you have the gethostbyname_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* Define if you have the gethostbyname_r() function with 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define if you have the inet_ntoa_r function declared. */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define if you need the _REENTRANT define for some functions */
+#undef NEED_REENTRANT

acinclude.m4

@@ -0,0 +1,75 @@
+#serial 12
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+        ,
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(AC_SYS_LARGEFILE,
+  [AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+       ac_cv_sys_largefile_source,
+       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
+       [#include <stdio.h>], [return !ftello;])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.])
+dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.
+dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
+dnl       ac_cv_sys_xopen_source,
+dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
+dnl       [#include <stdio.h>], [return !ftello;])
+   fi
+  ])

aclocal.m4

@@ -10,6 +10,82 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+#serial 12
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+        ,
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+AC_SYS_LARGEFILE_TEST_INCLUDES
+$5
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(AC_SYS_LARGEFILE,
+  [AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+       ac_cv_sys_largefile_source,
+       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
+       [#include <stdio.h>], [return !ftello;])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.])
+dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.
+dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
+dnl       ac_cv_sys_xopen_source,
+dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
+dnl       [#include <stdio.h>], [return !ftello;])
+   fi
+  ])
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
 AC_DEFUN(AM_CONFIG_HEADER,
@@ -125,3 +201,416 @@ else
 fi
 AC_SUBST($1)])
 
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags="--cache-file=$cache_file"
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$lt_target" in
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+])
+esac
+])
+
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+  enable_shared=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_shared=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
+
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+  enable_static=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_static=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
+    # Accept absolute paths.
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      ac_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	test "$with_gnu_ld" != no && break
+      else
+	test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])
+
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  ac_cv_prog_gnu_ld=yes
+else
+  ac_cv_prog_gnu_ld=no
+fi])
+])
+
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
+[AC_MSG_CHECKING([for BSD-compatible nm])
+AC_CACHE_VAL(ac_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  ac_cv_path_NM="$NM"
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
+	break
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
+	break
+      else
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$lt_target" in
+*-*-beos* | *-*-cygwin*)
+  # These system don't have libm
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, main, LIBM="-lm")
+  ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library and INCLTDL to the include flags for
+# the libltdl header and adds --enable-ltdl-convenience to the
+# configure arguments.  Note that LIBLTDL and INCLTDL are not
+# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+# with '${top_builddir}/' and INCLTDL will be prefixed with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library and INCLTDL to the include flags for
+# the libltdl header and adds --enable-ltdl-install to the configure
+# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
+# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
+# with '${top_srcdir}/' (note the single quotes!).  If your package is
+# not flat and you're not using automake, define top_builddir and
+# top_srcdir appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, main,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    INCLTDL=
+  fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
+

config-win32.h

@@ -71,6 +71,9 @@
 /* Define if you have the strcasecmp function.  */
 /*#define HAVE_STRCASECMP 1*/
 
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP 1
+
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
 
@@ -87,7 +90,7 @@
 /*#define HAVE_TCSETATTR 1*/
 
 /* Define if you have the uname function.  */
-#define HAVE_UNAME 1
+/*#define HAVE_UNAME 1*/
 
 /* Define if you have the <alloca.h> header file.  */
 /*#define HAVE_ALLOCA_H 1*/
@@ -114,7 +117,7 @@
 #define HAVE_NETDB_H 1
 
 /* Define if you have the <netinet/in.h> header file.  */
-#define HAVE_NETINET_IN_H 1
+/*#define HAVE_NETINET_IN_H 1*/
 
 /* Define if you have the <sgtty.h> header file.  */
 /*#define HAVE_SGTTY_H 1*/
@@ -146,15 +149,9 @@
 /* Define if you have the <termios.h> header file.  */
 #define HAVE_TERMIOS_H 1
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
 /* Name of package */
 #define PACKAGE "curl"
 
-/* Version number of package */
-#define VERSION "6.3.1"
-
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
 
@@ -172,3 +169,13 @@
 
 /* Define if you have the RAND_screen function when using SSL  */
 #define HAVE_RAND_SCREEN 1
+
+/*************************************************
+ * This section is for compiler specific defines.*
+ *************************************************/
+#ifdef MINGW32 /* Borland and MS don't have this */
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+#endif

config.guess

@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -22,8 +23,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -36,6 +36,20 @@
 # (but try to keep the structure clean).
 #
 
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -53,6 +67,43 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# Netbsd (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-cbm ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
+	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -62,45 +113,61 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
-	${CC-cc} $dummy.s -o $dummy 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./$dummy
-		case "$?" in
-			7)
+		case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -108,9 +175,6 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-cbm-sysv4
 	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -135,16 +199,16 @@ EOF
     wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -197,21 +261,38 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
     sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -224,9 +305,6 @@ EOF
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -236,12 +314,13 @@ EOF
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -260,7 +339,7 @@ EOF
 	  exit (-1);
 	}
 EOF
-	${CC-cc} $dummy.c -o $dummy \
+	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
@@ -281,14 +360,17 @@ EOF
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
 	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 	    fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
@@ -326,7 +408,7 @@ EOF
 			exit(0);
 			}
 EOF
-		${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -355,7 +437,7 @@ EOF
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -374,8 +456,10 @@ EOF
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
+	    9000/[678][0-9][0-9])
               sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -406,7 +490,7 @@ EOF
                   exit (0);
               }
 EOF
-	(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -438,7 +522,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -448,10 +532,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE*:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    *9??*:MPE*:*:*)
+    *9??*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -470,6 +551,9 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -500,49 +584,40 @@ EOF
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
     F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
     F301:UNIX_System_V:*:*)
        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	if test -x /usr/bin/objformat; then
-	    if test "elf" = "`/usr/bin/objformat`"; then
-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-		exit 0
-	    fi
-	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
@@ -552,6 +627,15 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i386-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
 	exit 0 ;;
@@ -562,16 +646,11 @@ EOF
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
-#	# uname on the ARM produces all sorts of strangeness, and we need to
-#	# filter it out.
-#	case "$UNAME_MACHINE" in
-#	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
-#	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-#	esac
 
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -579,53 +658,124 @@ EOF
 				    s/ .*//
 				    p'`
         case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  elf_i?86)
+		echo "${UNAME_MACHINE}-pc-linux"
+		exit 0
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc | elf32ppclinux)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unkown\n");
+#endif
+  return 0;
+}
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >$dummy.s
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
 			.globl main
+			.align 4
 			.ent main
 		main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
 			.end main
 EOF
 		LIBC=""
-		${CC-cc} $dummy.s -o $dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./$dummy
-			case "$?" in
-			7)
+			case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 			esac
 
 			objdump --private-headers $dummy | \
@@ -639,6 +789,7 @@ EOF
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -652,8 +803,10 @@ EOF
   return 0;
 }
 EOF
-	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -675,6 +828,7 @@ EOF
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -695,7 +849,7 @@ EOF
   return 0;
 }
 EOF
-	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
@@ -712,8 +866,18 @@ EOF
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
 	else
 	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
@@ -727,19 +891,20 @@ EOF
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:UnixWare:*:*)
-	if /bin/uname -X 2>/dev/null >/dev/null ; then
-	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-	    && UNAME_MACHINE=i586
-	fi
-	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
     pc:*:*:*)
+	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -825,7 +990,7 @@ EOF
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
@@ -853,6 +1018,27 @@ EOF
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	if test "${UNAME_MACHINE}" = "x86pc"; then
+		UNAME_MACHINE=pc
+	fi
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-W:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -959,7 +1145,7 @@ main ()
 }
 EOF
 
-${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.

config.h.in

@@ -10,12 +10,6 @@
 /* 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.  */
-#undef HAVE_VPRINTF
-
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
@@ -31,6 +25,30 @@
 /* Define cpu-machine-OS */
 #undef OS
 
+/* Define if you have the gethostbyaddr_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYADDR_R_5
+
+/* Define if you have the gethostbyaddr_r() function with 7 arguments */
+#undef HAVE_GETHOSTBYADDR_R_7
+
+/* Define if you have the gethostbyaddr_r() function with 8 arguments */
+#undef HAVE_GETHOSTBYADDR_R_8
+
+/* Define if you have the gethostbyname_r() function with 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3
+
+/* Define if you have the gethostbyname_r() function with 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5
+
+/* Define if you have the gethostbyname_r() function with 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6
+
+/* Define if you have the inet_ntoa_r function declared. */
+#undef HAVE_INET_NTOA_R_DECL
+
+/* Define if you need the _REENTRANT define for some functions */
+#undef NEED_REENTRANT
+
 /* The number of bytes in a long double.  */
 #undef SIZEOF_LONG_DOUBLE
 
@@ -49,6 +67,12 @@
 /* Define if you have the gethostbyaddr function.  */
 #undef HAVE_GETHOSTBYADDR
 
+/* Define if you have the gethostbyaddr_r function.  */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define if you have the gethostbyname_r function.  */
+#undef HAVE_GETHOSTBYNAME_R
+
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
@@ -67,6 +91,12 @@
 /* Define if you have the inet_ntoa function.  */
 #undef HAVE_INET_NTOA
 
+/* Define if you have the inet_ntoa_r function.  */
+#undef HAVE_INET_NTOA_R
+
+/* Define if you have the localtime_r function.  */
+#undef HAVE_LOCALTIME_R
+
 /* Define if you have the perror function.  */
 #undef HAVE_PERROR
 
@@ -82,12 +112,18 @@
 /* Define if you have the strcasecmp function.  */
 #undef HAVE_STRCASECMP
 
+/* Define if you have the strcmpi function.  */
+#undef HAVE_STRCMPI
+
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
 
+/* Define if you have the stricmp function.  */
+#undef HAVE_STRICMP
+
 /* Define if you have the strstr function.  */
 #undef HAVE_STRSTR
 
@@ -133,6 +169,9 @@
 /* Define if you have the <netdb.h> header file.  */
 #undef HAVE_NETDB_H
 
+/* Define if you have the <netinet/if_ether.h> header file.  */
+#undef HAVE_NETINET_IF_ETHER_H
+
 /* Define if you have the <netinet/in.h> header file.  */
 #undef HAVE_NETINET_IN_H
 
@@ -184,6 +223,9 @@
 /* Define if you have the <sys/stat.h> header file.  */
 #undef HAVE_SYS_STAT_H
 
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
@@ -232,3 +274,15 @@
 /* Version number of package */
 #undef VERSION
 
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to make ftello visible on some hosts (e.g. HP-UX 10.20). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Set to explicitly specify we don't want to use thread-safe functions */
+#undef DISABLED_THREADSAFE
+

config.sub

@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+#
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -68,7 +73,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -98,11 +103,21 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=sco3.2v5
+		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -121,6 +136,9 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -143,23 +161,36 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
-		| hppa2.0w \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-		| mipstx39 | mipstx39el | armv[34][lb] \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el | mcore \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -172,28 +203,49 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-	      | hppa2.0w-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-*)
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | bs2000-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -223,6 +275,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -299,6 +355,10 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -317,6 +377,14 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -332,13 +400,30 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -347,17 +432,16 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		os=-mpeix
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		os=-mpeix
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i[34567]86v32)
@@ -376,6 +460,22 @@ case $basic_machine in
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -404,6 +504,10 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
@@ -418,12 +522,32 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	msdos)
+		basic_machine=i386-unknown
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -438,6 +562,10 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -463,9 +591,28 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -483,19 +630,19 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -519,12 +666,20 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -532,6 +687,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sparclite-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -539,6 +698,13 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -579,10 +745,18 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3e)
+		basic_machine=t3e-cray
+		os=-unicos
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -600,6 +774,10 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -623,6 +801,14 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -630,6 +816,10 @@ case $basic_machine in
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -637,6 +827,15 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
@@ -659,7 +858,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -671,6 +870,16 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -724,14 +933,34 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
-	      | -openstep* | -mpeix* | -oskit*)
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i[34567]86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -741,6 +970,12 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -756,12 +991,18 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-386bsd)
+		os=-bsd
+		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
 	-ns2 )
 	        os=-nextstep2
 		;;
+	-nsk)
+		os=-nsk
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -787,9 +1028,18 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
 	-xenix)
 		os=-xenix
 		;;
+        -*mint | -*MiNT)
+	        os=-mint
+		;;
 	-none)
 		;;
 	*)
@@ -815,7 +1065,7 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
@@ -839,6 +1089,15 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -851,6 +1110,15 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -914,6 +1182,18 @@ case $basic_machine in
 	f301-fujitsu)
 		os=-uxpv
 		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
 	*)
 		os=-none
 		;;
@@ -935,10 +1215,10 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
-			-hpux*)
-				vendor=hp
+			-beos*)
+				vendor=be
 				;;
-			-mpeix*)
+			-hpux*)
 				vendor=hp
 				;;
 			-mpeix*)
@@ -959,7 +1239,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -971,6 +1251,15 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -*MiNT)
+				vendor=atari
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;

configure.in

@@ -2,16 +2,29 @@ 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.5.2")
+AM_INIT_AUTOMAKE(curl,"7.2")
+AM_PROG_LIBTOOL
+
+dnl
+dnl Detect the canonical host and target build environment
+dnl
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
 
 dnl Checks for programs.
 AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
 
 dnl Check for AIX weirdos
 AC_AIX
 
+dnl check for how to do large files
+AC_SYS_LARGEFILE
+
+dnl The install stuff has already been taken care of by the automake stuff
+dnl AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************
@@ -19,9 +32,37 @@ dnl **********************************************************************
 dnl nsl lib?
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
 
+dnl At least one system has been identified to require BOTH nsl and
+dnl socket libs to link properly.
+if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then
+  AC_MSG_CHECKING([trying both nsl and socket libs])
+  my_ac_save_LIBS=$LIBS
+  LIBS="-lnsl -lsocket $LIBS"
+  AC_TRY_LINK( ,
+             [gethostbyname();],
+             my_ac_link_result=success,
+             my_ac_link_result=failure )
+
+  if test "$my_ac_link_result" = "failure"; then
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([couldn't find libraries for gethostbyname()])
+    dnl restore LIBS
+    LIBS=$my_ac_save_LIBS
+  else
+    AC_MSG_RESULT([yes])
+  fi
+fi
+
 dnl resolve lib?
 AC_CHECK_FUNC(strcasecmp, , AC_CHECK_LIB(resolve, strcasecmp))
 
+if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then
+  AC_CHECK_LIB(resolve, strcasecmp,
+              [LIBS="-lresolve $LIBS"],
+               ,
+               -lnsl)
+fi
+
 dnl socket lib?
 AC_CHECK_FUNC(connect, , AC_CHECK_LIB(socket, connect))
 
@@ -111,6 +152,218 @@ dnl fi
 dnl z lib?
 dnl AC_CHECK_FUNC(gzread, , AC_CHECK_LIB(z, gzread))
 
+
+dnl Default is to try the thread-safe versions of a few functions
+OPT_THREAD=on
+AC_ARG_ENABLE(thread,dnl
+[  --disable-thread       tell configure to not look for thread-safe functions],
+  OPT_THREAD=off
+)
+
+if test X"$OPT_THREAD" = Xoff
+then
+  AC_MSG_WARN(libcurl will not get built using thread-safe functions)
+  AC_DEFINE(DISABLED_THREADSAFE, 1, \
+Set to explicitly specify we don't want to use thread-safe functions)
+else
+  dnl check for number of arguments to gethostbyname_r. it might take
+  dnl either 3, 5, or 6 arguments.
+  AC_CHECK_FUNCS(gethostbyname_r,[
+    AC_MSG_CHECKING(if gethostbyname_r takes 3 arguments)
+    AC_TRY_RUN([
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent h;
+struct hostent_data hdata;
+char *name = "localhost";
+int rc;
+memset(&h, 0, sizeof(struct hostent));
+memset(&hdata, 0, sizeof(struct hostent_data));
+rc = gethostbyname_r(name, &h, &hdata);
+exit (rc != 0 ? 1 : 0); }],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
+      ac_cv_gethostbyname_args=3],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(if gethostbyname_r with -D_REENTRANT takes 3 arguments)
+      AC_TRY_RUN([
+#define _REENTRANT
+
+#include <string.h>
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent h;
+struct hostent_data hdata;
+char *name = "localhost";
+int rc;
+memset(&h, 0, sizeof(struct hostent));
+memset(&hdata, 0, sizeof(struct hostent_data));
+rc = gethostbyname_r(name, &h, &hdata);
+exit (rc != 0 ? 1 : 0); }],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
+	AC_DEFINE(NEED_REENTRANT)
+	ac_cv_gethostbyname_args=3],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING(if gethostbyname_r takes 5 arguments)
+	AC_TRY_RUN([
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent *hp;
+struct hostent h;
+char *name = "localhost";
+char buffer[8192];
+int h_errno;
+hp = gethostbyname_r(name, &h, buffer, 8192, &h_errno);
+exit (hp == NULL ? 1 : 0); }],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
+          ac_cv_gethostbyname_args=5],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING(if gethostbyname_r takes 6 arguments)
+	  AC_TRY_RUN([
+#include <sys/types.h>
+#include <netdb.h>
+
+int
+main () {
+struct hostent h;
+struct hostent *hp;
+char *name = "localhost";
+char buf[8192];
+int rc;
+int h_errno;
+rc = gethostbyname_r(name, &h, buf, 8192, &hp, &h_errno);
+exit (rc != 0 ? 1 : 0); }],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
+            ac_cv_gethostbyname_args=6],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyname_r"],
+	    [ac_cv_gethostbyname_args=0])],
+	  [ac_cv_gethostbyname_args=0])],
+	[ac_cv_gethostbyname_args=0])],
+      [ac_cv_gethostbyname_args=0])])
+
+  dnl check for number of arguments to gethostbyaddr_r. it might take
+  dnl either 5, 7, or 8 arguments.
+  AC_CHECK_FUNCS(gethostbyaddr_r,[
+    AC_MSG_CHECKING(if gethostbyaddr_r takes 5 arguments)
+    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
+      ac_cv_gethostbyaddr_args=5],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(if gethostbyaddr_r with -D_REENTRANT takes 5 arguments)
+      AC_TRY_COMPILE([
+#define _REENTRANT
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+struct hostent_data hdata;
+int rc;
+rc = gethostbyaddr_r(address, length, type, &h, &hdata);],[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_GETHOSTBYADDR_R_5)
+	AC_DEFINE(NEED_REENTRANT)
+	ac_cv_gethostbyaddr_args=5],[
+	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING(if gethostbyaddr_r takes 7 arguments)
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[10];
+int buflen;
+int h_errnop;
+struct hostent * hp;
+
+hp = gethostbyaddr_r(address, length, type, &h,
+                     buffer, buflen, &h_errnop);],[
+	  AC_MSG_RESULT(yes)
+	  AC_DEFINE(HAVE_GETHOSTBYADDR_R_7)
+	  ac_cv_gethostbyaddr_args=7],[
+	  AC_MSG_RESULT(no)
+	  AC_MSG_CHECKING(if gethostbyaddr_r takes 8 arguments)
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <netdb.h>],[
+char * address;
+int length;
+int type;
+struct hostent h;
+char buffer[10];
+int buflen;
+int h_errnop;
+struct hostent * hp;
+int rc;
+
+rc = gethostbyaddr_r(address, length, type, &h,
+                     buffer, buflen, &hp, &h_errnop);],[
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8)
+	    ac_cv_gethostbyaddr_args=8],[
+	    AC_MSG_RESULT(no)
+	    have_missing_r_funcs="$have_missing_r_funcs gethostbyaddr_r"])])])])])
+
+  dnl determine if function definition for inet_ntoa_r exists.
+  AC_CHECK_FUNCS(inet_ntoa_r,[
+    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
+    AC_EGREP_CPP(inet_ntoa_r,[
+#include <arpa/inet.h>],[
+      AC_DEFINE(HAVE_INET_NTOA_R_DECL)
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(inet_ntoa_r,[
+#define _REENTRANT
+#include <arpa/inet.h>],[
+	AC_DEFINE(HAVE_INET_NTOA_R_DECL)
+	AC_DEFINE(NEED_REENTRANT)
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+
+  dnl check for a few thread-safe functions
+  AC_CHECK_FUNCS(localtime_r,[
+    AC_MSG_CHECKING(whether localtime_r is declared)
+    AC_EGREP_CPP(localtime_r,[
+#include <time.h>],[
+      AC_MSG_RESULT(yes)],[
+      AC_MSG_RESULT(no)
+      AC_MSG_CHECKING(whether localtime_r with -D_REENTRANT is declared)
+      AC_EGREP_CPP(localtime_r,[
+#define _REENTRANT
+#include <time.h>],[
+	AC_DEFINE(NEED_REENTRANT)
+	AC_MSG_RESULT(yes)],
+	AC_MSG_RESULT(no))])])
+fi
+
 dnl **********************************************************************
 dnl Back to "normal" configuring
 dnl **********************************************************************
@@ -124,12 +377,14 @@ AC_CHECK_HEADERS( \
         arpa/inet.h \
         net/if.h \
         netinet/in.h \
+	netinet/if_ether.h \
         netdb.h \
         sys/select.h \
         sys/socket.h \
         sys/sockio.h \
         sys/stat.h \
         sys/types.h \
+        sys/time.h \
         getopt.h \
         sys/param.h \
         termios.h \
@@ -165,7 +420,7 @@ AC_DEFINE_UNQUOTED(OS, "${host}")
 dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
+dnl AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( socket \
                 select \
                 strdup \
@@ -173,6 +428,8 @@ AC_CHECK_FUNCS( socket \
                 strftime \
                 uname \
                 strcasecmp \
+                stricmp \
+                strcmpi \
                 gethostname \
                 gethostbyaddr \
                 getservbyname \
@@ -189,7 +446,9 @@ AC_CHECK_FUNCS( socket \
                 RAND_screen
 )
 
-
+if test "$ac_cv_func_select" != "yes"; then
+  AC_MSG_ERROR(Can't work without an existing socket() function)
+fi
 
 AC_PATH_PROG( PERL, perl, , 
   $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
@@ -199,7 +458,6 @@ AC_PATH_PROGS( NROFF, gnroff nroff, ,
   $PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST(NROFF)
 
-AC_PROG_RANLIB
 AC_PROG_YACC
 
 dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib, 
@@ -207,6 +465,11 @@ dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)
 
 AC_OUTPUT( Makefile \
+           curl.spec \
+           curl-ssl.spec \
+	   docs/Makefile \
+	   include/Makefile \
+	   include/curl/Makefile \
 	   src/Makefile \
            lib/Makefile )
 dnl	   perl/checklinks.pl \

curl-ssl.spec

@@ -1,52 +0,0 @@
-%define name curl-ssl
-%define tarball curl
-%define version 6.0
-%define release 1
-%define prefix /usr/local
-
-%define builddir $RPM_BUILD_DIR/%{tarball}-%{version}
-
-Summary: get a file from a FTP, GOPHER or HTTP server.
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Copyright: MPL
-Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.nu>
-Packager: Troy Engel <tengel@sonic.net>
-Group: Utilities/Console
-Source: %{tarball}-%{version}.tar.gz
-URL: http://curl.haxx.nu/
-BuildRoot: /tmp/%{tarball}-%{version}-root
-
-%description
-curl is a client to get documents/files from servers, using any of the
-supported protocols. The command is designed to work without user
-interaction or any kind of interactivity.
-
-curl offers a busload of useful tricks like proxy support, user
-authentication, ftp upload, HTTP post, file transfer resume and more.
-
-Note: this version is compiled with SSL (https:) support.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf %{builddir}
-
-%setup -n %{tarball}-%{version} 
-
-%build
-CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=$RPM_BUILD_ROOT%{prefix} --with-ssl
-make CFLAGS="-DUSE_SSLEAY -I/usr/include/openssl"
-
-%install
-make install-strip
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf %{builddir}
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{prefix}/bin/curl
-%doc curl.1 README* CHANGES CONTRIBUTE FAQ FILES INSTALL LEGAL MPL-1.0.txt RESOURCES TODO perl/
-

curl-ssl.spec.in

@@ -0,0 +1,98 @@
+%define ver	@VERSION@
+%define rel	1
+%define prefix	/usr
+
+Summary:	get a file from a FTP, GOPHER or HTTP server.
+Name:		@PACKAGE@-ssl
+Version:	%ver
+Release:	%rel
+Copyright:	MPL
+Group:		Utilities/Console
+Source:		@PACKAGE@-%{version}.tar.gz
+URL:		http://@PACKAGE@.haxx.se
+BuildPrereq:	openssl
+BuildRoot:	/tmp/%{name}-%{version}-%{rel}-root
+Packager:	Fill In As You Wish
+Docdir:		%{prefix}/doc
+
+%description
+@PACKAGE@-ssl is a client to get documents/files from servers, using 
+any of the supported protocols.  The command is designed to 
+work without user interaction or any kind of interactivity.
+
+@PACKAGE@-ssl offers a busload of useful tricks like proxy support, 
+user authentication, ftp upload, HTTP post, file transfer 
+resume and more.
+
+Note: this version is compiled with SSL (https:) support.
+
+Authors:
+	Daniel Stenberg <daniel@haxx.se>
+
+
+%prep
+%setup -n @PACKAGE@-@VERSION@
+
+
+%build
+# Needed for snapshot releases.
+if [ ! -f configure ]; then
+	CONF="./autogen.sh"
+else
+	CONF="./configure"
+fi
+
+#
+# Configuring the package
+#
+CFLAGS="${RPM_OPT_FLAGS}" ${CONF}	\
+	--prefix=%{prefix}		\
+	--with-ssl
+
+
+[ "$SMP" != "" ] && JSMP = '"MAKE=make -k -j $SMP"'
+
+make ${JSMP} CFLAGS="-DUSE_SSLEAY -I/usr/include/openssl";
+
+
+%install
+[ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT}
+
+make prefix=${RPM_BUILD_ROOT}%{prefix} install-strip
+
+#
+# Generating file lists and store them in file-lists
+# Starting with the directory listings
+#
+find ${RPM_BUILD_ROOT}%{prefix}/{bin,lib,man} -type d | sed "s#^${RPM_BUILD_ROOT}#\%attr (-\,root\,root) \%dir #" > file-lists
+
+#
+# Then, the file listings
+#
+echo "%defattr (-, root, root)" >> file-lists
+find ${RPM_BUILD_ROOT}%{prefix} -type f | sed -e "s#^${RPM_BUILD_ROOT}##g" >> file-lists
+
+
+%clean
+(cd ..; rm -rf @PACKAGE@-@VERSION@ ${RPM_BUILD_ROOT})
+
+
+%files -f file-lists
+%defattr (-, root, root)
+%doc BUGS
+%doc CHANGES
+%doc CONTRIBUTE
+%doc FAQ
+%doc FEATURES
+%doc FILES
+%doc INSTALL
+%doc LEGAL
+%doc MPL-1.0.txt
+%doc README
+%doc README.curl
+%doc README.lib@PACKAGE@
+%doc RESOURCES
+%doc TODO
+%doc %{name}-ssl.spec.in
+%doc %{name}.spec.in
+

curl.spec

@@ -1,52 +0,0 @@
-%define name curl
-%define version 6.0
-%define release 1
-%define prefix /usr/local
-
-%define builddir $RPM_BUILD_DIR/%{name}-%{version}
-
-Summary: get a file from a FTP, GOPHER or HTTP server.
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Copyright: MPL
-Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.nu>
-Packager: Troy Engel <tengel@sonic.net>
-Group: Utilities/Console
-Source: %{name}-%{version}.tar.gz
-URL: http://curl.haxx.nu/
-BuildRoot: /tmp/%{name}-%{version}-root
-
-%description
-curl is a client to get documents/files from servers, using any of the
-supported protocols. The command is designed to work without user
-interaction or any kind of interactivity.
-
-curl offers a busload of useful tricks like proxy support, user
-authentication, ftp upload, HTTP post, file transfer resume and more.
-
-Note: this version is compiled without SSL (https:) support.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf %{builddir}
-
-%setup  
-
-%build
-export CFLAGS=$RPM_OPT_FLAGS 
-./configure --prefix=$RPM_BUILD_ROOT%{prefix}
-make 
-
-%install
-make install-strip
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf %{builddir}
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{prefix}/bin/curl
-%doc curl.1 README* CHANGES CONTRIBUTE FAQ FILES INSTALL LEGAL MPL-1.0.txt RESOURCES TODO perl/
-

curl.spec.in

@@ -0,0 +1,96 @@
+%define ver	@VERSION@
+%define rel	1
+%define prefix	/usr
+
+Summary:	get a file from a FTP, GOPHER or HTTP server.
+Name:		@PACKAGE@
+Version:	%ver
+Release:	%rel
+Copyright:	MPL
+Group:		Utilities/Console
+Source:		%{name}-%{version}.tar.gz
+URL:		http://@PACKAGE@.haxx.se
+BuildRoot:	/tmp/%{name}-%{version}-%{rel}-root
+Packager:	Fill In As You Wish
+Docdir:		%{prefix}/doc
+
+%description
+@PACKAGE@ is a client to get documents/files from servers, using 
+any of the supported protocols.  The command is designed to 
+work without user interaction or any kind of interactivity.
+
+@PACKAGE@ offers a busload of useful tricks like proxy support, 
+user authentication, ftp upload, HTTP post, file transfer 
+resume and more.
+
+Note: this version is compiled without SSL (https:) support.
+
+Authors:
+	Daniel Stenberg <daniel@haxx.se>
+
+
+%prep
+%setup -n %{name}-%{version}
+
+
+%build
+# Needed for snapshot releases.
+if [ ! -f configure ]; then
+	CONF="./autogen.sh"
+else
+	CONF="./configure"
+fi
+
+#
+# Configuring the package
+#
+CFLAGS="${RPM_OPT_FLAGS}" ${CONF}	\
+	--prefix=%{prefix}
+
+
+[ "$SMP" != "" ] && JSMP = '"MAKE=make -k -j $SMP"'
+
+make ${JSMP};
+
+
+%install
+[ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT}
+
+make prefix=${RPM_BUILD_ROOT}%{prefix} install-strip
+
+#
+# Generating file lists and store them in file-lists
+# Starting with the directory listings
+#
+find ${RPM_BUILD_ROOT}%{prefix}/{bin,lib,man} -type d | sed "s#^${RPM_BUILD_ROOT}#\%attr (-\,root\,root) \%dir #" > file-lists
+
+#
+# Then, the file listings
+#
+echo "%defattr (-, root, root)" >> file-lists
+find ${RPM_BUILD_ROOT}%{prefix} -type f | sed -e "s#^${RPM_BUILD_ROOT}##g" >> file-lists
+
+
+%clean
+(cd ..; rm -rf %{name}-%{version} ${RPM_BUILD_ROOT})
+
+
+%files -f file-lists
+%defattr (-, root, root)
+%doc BUGS
+%doc CHANGES
+%doc CONTRIBUTE
+%doc FAQ
+%doc FEATURES
+%doc FILES
+%doc INSTALL
+%doc LEGAL
+%doc MPL-1.0.txt
+%doc README
+%doc README.curl
+%doc README.lib@PACKAGE@
+%doc RESOURCES
+%doc TODO
+%doc %{name}-ssl.spec.in
+%doc %{name}.spec.in
+

docs/BUGS

@@ -46,11 +46,11 @@ BUGS
   should be replaced with the name of your debugger, in most cases that will
   be 'gdb', but 'dbx' and others also occur.
 
-  When the debugger has finnished loading the core file and presents you a
+  When the debugger has finished loading the core file and presents you a
   prompt, you can give the compiler instructions. Enter 'where' (without the
   quotes) and press return.
 
   The list that is presented is the stack trace. If everything worked, it is
-  supposed to contain the chaing of functions that were called when curl
+  supposed to contain the chain of functions that were called when curl
   crashed.
 

docs/CONTRIBUTE

@@ -8,43 +8,53 @@ CONTRIBUTE
 
 To Think About When Contributing Source Code
 
- This document is intended to offer some guidelines that can be useful to
- keep in mind when you decide to write a contribution to the project. This
- concerns new features as well as corrections to existing flaws or bugs.
+ This document is intended to offer some guidelines that can be useful to keep
+ in mind when you decide to write a contribution to the project. This concerns
+ new features as well as corrections to existing flaws or bugs.
+
+The License Issue
+
+ When contributing with code, you agree to put your changes and new code under
+ the same license curl and libcurl is already using. Curl uses the MozPL, the
+ Mozilla Public License, which is *NOT* compatible with the well known GPL,
+ GNU Public License. We can never re-use sources from a GPL program in curl.
+ If you add a larger piece of code, you can opt to make that file or set of
+ files to use a different license as long as they don't enfore any changes to
+ the rest of the package. Such "separate parts" can not be GPL either.
 
 Naming
 
  Try using a non-confusing naming scheme for your new functions and variable
- names. It doesn't necessarily have to mean that you should use the same as
- in other places of the code, just that the names should be logical,
+ names. It doesn't necessarily have to mean that you should use the same as in
+ other places of the code, just that the names should be logical,
  understandable and be named according to what they're used for.
 
 Indenting
 
  Please try using the same indenting levels and bracing method as all the
  other code already does. It makes the source code a lot easier to follow if
- all of it is written using the same style. I don't ask you to like it, I
- just ask you to follow the tradition! ;-)
+ all of it is written using the same style. I don't ask you to like it, I just
+ ask you to follow the tradition! ;-)
 
 Commenting
 
  Comment your source code extensively. I don't see myself as a very good
- source commenter, but I try to become one. Commented code is quality code
- and enables future modifications much more. Uncommented code much more risk
- being completely replaced when someone wants to extend things, since other
- persons' source code can get quite hard to read.
+ source commenter, but I try to become one. Commented code is quality code and
+ enables future modifications much more. Uncommented code much more risk being
+ completely replaced when someone wants to extend things, since other persons'
+ source code can get quite hard to read.
 
 General Style
 
  Keep your functions small. If they're small you avoid a lot of mistakes and
- you don't accidentaly mix up variables.
+ you don't accidentally mix up variables.
 
 Non-clobbering All Over
 
- When you write new functionality or fix bugs, it is important that you
- don't fiddle all over the source files and functions. Remember that it is
- likely that other people have done changes in the same source files as you
- have and possibly even in the same functions. If you bring completely new
+ When you write new functionality or fix bugs, it is important that you don't
+ fiddle all over the source files and functions. Remember that it is likely
+ that other people have done changes in the same source files as you have and
+ possibly even in the same functions. If you bring completely new
  functionality, try writing it in a new source file. If you fix bugs, try to
  fix one bug at a time and send them as separate patches.
 
@@ -61,10 +71,10 @@ Separate Patches Doing Different Things
 
 Document
 
- Writing docs is dead boring and one of the big problems with many open
- source projects. Someone's gotta do it. It makes it a lot easier if you
- submit a small description of your fix or your new features with every
- contribution so that it can be swiftly added to the package documentation.
+ Writing docs is dead boring and one of the big problems with many open source
+ projects. Someone's gotta do it. It makes it a lot easier if you submit a
+ small description of your fix or your new features with every contribution so
+ that it can be swiftly added to the package documentation.
 
 Write Access to CVS Repository
 

docs/FAQ

@@ -0,0 +1,458 @@
+Updated: August 22, 2000 (http://curl.haxx.se/docs/faq.shtml)
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+FAQ
+
+ 1. Philosophy
+  1.1 What is cURL?
+  1.2 What is libcurl?
+  1.3 What is cURL not?
+  1.4 When will you make curl do XXXX ?
+
+ 2. Install Related Problems
+  2.1 configure doesn't find OpenSSL even when it is installed
+   2.1.1. native linker doesn't find openssl
+   2.1.2. only the libssl lib is missing
+  2.2 Does curl work/build with other SSL libraries?
+  2.3 Where can I find a copy of LIBEAY32.DLL?
+  2.4 Does cURL support Socks (RFC 1928) ?
+
+ 3. Usage Problems
+  3.1 curl: (1) SSL is disabled, https: not supported
+  3.2 How do I tell curl to resume a transfer?
+  3.3 Why doesn't my posting using -F work?
+  3.4 How do I tell curl to run custom FTP commands?
+  3.5 How can I disable the Pragma: nocache header?
+  3.6 Does curl support javascript, ASP, XML, XHTML or HTML version Y?
+  3.7 Can I use curl to delete/rename a file through FTP?
+  3.8 How do I tell curl to follow HTTP redirects?
+
+ 4. Running Problems
+  4.1 Problems connecting to SSL servers.
+  4.2 Why do I get problems when I use & in the URL?
+  4.3 How can I use {, }, [ or ] to specify multiple URLs?
+  4.4 Why do I get downloaded data even though the web page doesn't exist?
+  4.5 Why do I get return code XXX from a HTTP server?
+   4.5.1 "400 Bad Request"
+   4.5.2 "401 Unauthorized"
+   4.5.3 "403 Forbidden"
+   4.5.4 "404 Not Found"
+   4.5.5 "405 Method Not Allowed"
+  4.6 Can you tell me what error code 142 means?
+
+ 5. libcurl Issues
+  5.1 Is libcurl thread safe?
+
+ 6. License Issues
+  6.1 I have a GPL program, can I use the libcurl library?
+  6.2 I have a closed-source program, can I use the libcurl library?
+  6.3 I have a BSD licensed program, can I use the libcurl library?
+  6.4 I have a program that uses LGPL libraries, can I use libcurl?
+  6.5 Can I modify curl/libcurl for my program and keep the changes secret?
+  6.6 Can you please change the curl/libcurl license to XXXX?
+
+==============================================================================
+
+1. Philosophy
+
+  1.1 What is cURL?
+
+  cURL (or simply just 'curl') is a command line tool for getting or sending
+  files using URL syntax. The name is a play on 'Client for URLs', originally
+  with URL spelled in uppercase to make it obvious it deals with URLs.
+
+  Curl supports a range of common internet protocols, currently including
+  HTTP, HTTPS, FTP, GOPHER, LDAP, DICT and FILE.
+
+  1.2 What is libcurl?
+
+  libcurl is the engine inside curl that does all the work. curl is more or
+  less the command line interface that converts the given options into libcurl
+  function invokes. libcurl is a reliable, higly portable multiprotocol file
+  transfer library.
+
+  Any application is free to use libcurl, even commercial or closed-source
+  ones. Just make sure changes to the lib itself is made public.
+
+  1.3 What is cURL not?
+  
+  Curl is *not*, I repeat, *not* a wget clone even though that is a very
+  common misconception. Never, during curl's development, have I intended curl
+  to replace wget or compete on its market. Curl is targeted at single-shot
+  file transfers.
+
+  Curl is not a web site mirroring program. If you wanna use curl to mirror
+  something: fine, go ahead and write a script that wraps around curl to make
+  it reality (like curlmirror.pl does).
+
+  Curl is not an ftp site mirroring program. Sure, get and send ftp with curl
+  but if you want systematic and sequential behaviour you should write a
+  script (or write a new program that interfaces libcurl) and do it.
+
+  Curl is not a PHP tool, even though it works perfectly well when used from
+  or with PHP.
+
+  Curl is not a single-OS program. Curl exists, compiles, builds and runs
+  under a long range of operating systems, including all modern Unixes,
+  Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
+
+  1.4 When will you make curl do XXXX ?
+
+  I love suggestions of what to change in order to make curl and libcurl
+  better. I do however believe in a few rules when it comes to the future of
+  curl:
+
+  * It is to remain a command line tool. If you want GUIs or fancy scripting
+    capabilities, you're free to write another tool that uses libcurl and that
+    offers this. There's no point in having one single tool that does every
+    imaginable thing. That's also one of the great advantages of having the
+    core of curl as a library: libcurl.
+
+  * I do not add things to curl that other small and available tools already
+    do very fine at the side. Curl's output is fine to pipe into another
+    program or redirect to another file for the next program to interpret.
+
+  * I focus on protocol related issues and improvements. If you wanna do more
+    magic with the supported protocols than curl currently does, changes are
+    big I will agree. If you wanna add more protocols, I may very well
+    agree.
+
+  * If you want me to make all the work while you wait for me to implement it
+    for you, that is not a very friendly attitude. I spend a considerable time
+    already on maintaining and developing curl. In order to get more out of
+    me, I trust you will offer some of your time and efforts in return.
+
+  * If you write the code, chances are bigger that it will get into curl
+    faster.
+
+2. Install Related Problems
+
+  2.1. configure doesn't find OpenSSL even when it is installed
+
+  This may be because of several reasons.
+
+  2.1.1. native linker doesn't find openssl
+
+    Affected platforms:
+      Solaris (native cc compiler)
+      HPUX (native cc compiler)
+      SGI IRIX (native cc compiler)
+
+    When configuring curl, I specify --with-ssl. OpenSSL is installed in
+    /usr/local/ssl Configure reports SSL in /usr/local/ssl, but fails to find
+    CRYPTO_lock in -lcrypto
+
+    Cause: The cc for this test places the -L/usr/local/ssl/lib AFTER
+    -lcrypto, so ld can't find the library. This is due to a bug in the GNU
+    autoconf tool.
+
+    Workaround: Specifying "LDFLAGS=-L/usr/local/ssl/lib" in front of
+    ./configure places the -L/usr/local/ssl/lib early enough in the command
+    line to make things work
+
+    Solution submitted by: Bob Allison <allisonb@users.sourceforge.net>
+
+  2.1.2. only the libssl lib is missing
+
+    If all include files and the libcrypto lib is present, with only the
+    libssl being missing according to configure, this is mostly likely because
+    a few functions are left out from the libssl.
+
+    If the function names missing include RSA or RSAREF you can be certain
+    that this is because libssl requires the RSA and RSASEF libs to build.
+
+    See the INSTALL file section that explains how to add those libs to
+    configure. Make sure that you remove the config.cache file before you
+    rerun configure with the new flags.
+
+  2.2. Does curl work/build with other SSL libraries?
+
+  Curl has been written to use OpenSSL, although I doubt there would be much
+  problems using a different library. I just don't know any other free one and
+  that has limited my possibilities to develop against anything else.
+
+  If anyone does "port" curl to use a commercial SSL library, I am of course
+  very interested in getting the patch!
+
+  2.3. Where can I find a copy of LIBEAY32.DLL?
+
+  That is an OpenSSL binary built for Windows.
+
+  Curl uses OpenSSL to do the SSL stuff. The LIBEAY32.DLL is what curl needs
+  on a windows machine to do https://. Check out the curl web page to find
+  accurate and up-to-date pointers to recent OpenSSL DDLs and other binary
+  packages.
+
+  2.4. Does cURL support Socks (RFC 1928) ?
+
+  No. Nobody has wanted it that badly yet. I would appriciate patches that
+  brings this functionality.
+
+
+
+3. Usage problems
+
+  3.1. curl: (1) SSL is disabled, https: not supported
+
+  If you get this output when trying to get anything from a https:// server,
+  it means that the configure script couldn't find all libs and include files
+  it requires for SSL to work. If the configure script fails to find them,
+  curl is simply built without SSL support.
+
+  To get the https:// support into a curl that was previously built but that
+  reports that https:// is not supported, you should dig through the document
+  and logs and check out why the configure script doesn't find the SSL libs
+  and/or include files.
+
+  Also, check out the other paragraph in this FAQ labeled "configure doesn't
+  find OpenSSL even when it is installed".
+
+  3.2. How do I tell curl to resume a transfer?
+
+  Curl supports resume both ways on FTP, download ways on HTTP.
+
+  Try the -c and -C options.
+
+  3.3. Why doesn't my posting using -F work?
+
+  You can't simply use -F or -d at your choice. The web server that will
+  receive your post assumes one of the formats. If the form you're trying to
+  "fake" sets the type to 'multipart/form-data', than and only then you must
+  use the -F type. In all the most common cases, you should use -d which then
+  causes a posting with the type 'application/x-www-form-urlencoded'.
+
+  I have described this in some detail in the README.curl file, and if you
+  don't understand it the first time, read it again before you post questions
+  about this to the mailing list. I would also suggest that you read through
+  the mailing list archives for old postings and questions regarding this.
+
+  3.4. How do I tell curl to run custom FTP commands?
+
+  You can tell curl to perform optional commands both before and/or after a
+  file transfer. Study the -Q/--quote option.
+
+  Since curl is used for file transfers, you don't use curl to just perform
+  ftp commands without transfering anything. Therefore you must always specify
+  a URL to transfer to/from even when doing custom FTP commands.
+
+  3.5. How can I disable the Pragma: nocache header?
+
+  You can change all internally generated headers by adding a replacement with
+  the -H/--header option. By adding a header with empty contents you safely
+  disable that one. Use -H "Pragma:" to disable that specific header.
+
+  3.6. Does curl support javascript, ASP, XML, XHTML or HTML version Y?
+
+  To curl, all contents are alike. It doesn't matter how the page was
+  generated. It may be ASP, PHP, perl, shell-script, SSI or plain
+  HTML-files. There's no difference to curl and it doesn't even know what kind
+  of language that generated the page.
+
+  Javascript is slightly different since that is code embedded in the HTML
+  that is sent for the client to interpret and curl has no javascript
+  interpreter.
+
+  3.7. Can I use curl to delete/rename a file through FTP?
+
+  Yes. You specify custom ftp commands with -Q/--quote.
+
+  One example would be to delete a file after you have downloaded it:
+
+     curl -O ftp://download.com/coolfile -Q '-DELE coolfile'
+
+  3.8 How do I tell curl to follow HTTP redirects?
+
+  Curl does not follow so-called redirects by default. The Location: header
+  that informs the client about this is only interpreted if you're using the
+  -L/--location option. As in:
+
+     curl -L http://redirector.com
+
+4. Running Problems
+
+  4.1. Problems connecting to SSL servers.
+
+  It took a very long time before I could sort out why curl had problems
+  to connect to certain SSL servers when using SSLeay or OpenSSL v0.9+.
+  The error sometimes showed up similar to:
+
+  16570:error:1407D071:SSL routines:SSL2_READ:bad mac decode:s2_pkt.c:233:
+
+  It turned out to be because many older SSL servers don't deal with SSLv3
+  requests properly. To correct this problem, tell curl to select SSLv2 from
+  the command line (-2/--sslv2).
+
+  I have also seen examples where the remote server didn't like the SSLv2
+  request and instead you had to force curl to use SSLv3 with -3/--sslv3.
+
+  4.2. Why do I get problems when I use & in the URL?
+
+  In general unix shells, the & letter is treated special and when used it
+  runs the specified command in the background. To safely send the & as a part
+  of a URL, you should qoute the entire URL by using single (') or double (")
+  quotes around it.
+
+  An example that would invoke a remote CGI that uses &-letters could be:
+
+     curl 'http://www.altavista.com/cgi-bin/query?text=yes&q=curl'
+
+  4.3. How can I use {, }, [ or ] to specify multiple URLs?
+
+  Because those letters have a special meaning to the shell, and to be used in
+  a URL specified to curl you must quote them.
+
+  An example that downloads two URLs (sequentially) would do:
+
+    curl '{curl,www}.haxx.se'
+
+  4.4. Why do I get downloaded data even though the web page doesn't exist?
+
+  Curl asks remote servers for the page you specify. If the page doesn't exist
+  at the server, the HTTP protocol defines how the server should respond and
+  that means that headers and a "page" will be returned. That's simply how
+  HTTP works.
+
+  By using the --fail option you can tell curl explicitly to not get any data
+  if the HTTP return code doesn't say success.
+
+  4.5 Why do I get return code XXX from a HTTP server?
+
+  RFC2616 clearly explains the return codes. I'll make a short transcript
+  here. Go read the RFC for exact details:
+
+  4.5.1 "400 Bad Request"
+
+    The request could not be understood by the server due to malformed
+    syntax. The client SHOULD NOT repeat the request without modifications.
+
+  4.5.2 "401 Unauthorized"
+
+    The request requires user authentication.
+
+  4.5.3 "403 Forbidden"
+
+    The server understood the request, but is refusing to fulfill it.
+    Authorization will not help and the request SHOULD NOT be repeated.
+
+   4.5.4 "404 Not Found"
+
+    The server has not found anything matching the Request-URI. No indication
+    is given of whether the condition is temporary or permanent.
+
+   4.5.5 "405 Method Not Allowed"
+
+    The method specified in the Request-Line is not allowed for the resource
+    identified by the Request-URI. The response MUST include an Allow header
+    containing a list of valid methods for the requested resource.
+
+  4.6. Can you tell me what error code 142 means?
+
+  All error codes that are larger than the highest documented error code means
+  that curl has existed due to a timeout. There is currentl no nice way for
+  curl to abort from such a condition and that's why it gets this undocumented
+  error. This is planned to change in a future release.
+
+  4.7. How do I keep usernames and passwords secret in Curl command lines?
+
+  I see this problem as two parts:
+
+  The first part is to avoid having clear-text passwords in the command line
+  so that they don't appear in 'ps' outputs and similar. That is easily
+  avoided by using the "-K" option tho tell curl to read parameters from a
+  file or stdin to which you can pass the secret info.
+
+  To keep the passwords in your account secret from the rest of the world is
+  not a task that curl addresses. You could of course encrypt them somehow to
+  at least hide them from being read by human eyes, but that is not what
+  anyone would call security.
+
+
+5. libcurl Issues
+
+  5.1. Is libcurl thread safe?
+
+  As version seven is slowly marching in as the libcurl version to use, we
+  have made a serious attempt to address all places in the code where we could
+  forsee problems for multi-threaded programs. If your system has them, curl
+  will attempt to use threadsafe functions instead of non-safe ones.
+
+  I am very interested in once and for all getting some kind of report or
+  README file from those who have used libcurl in a threaded environment,
+  since I haven't and I get this question more and more frequently!
+
+6. License Issues
+
+  Curl and libcurl are released under the MPL, the Mozilla Public License. To
+  get a really good answer to this or other licensing questions, you should
+  study the MPL license and the license you are about to use and check for
+  clashes yourself. This is a brief summary for the cases we get the most
+  questions. (Parts of this section was enhanced by Bjorn Reese.)
+
+  6.1. I have a GPL program, can I use the libcurl library?
+
+  No, unfortunately you cannot distribute the (lib)curl code with your code.
+  According to both the Free Software Foundation and the Mozilla
+  Organization, MPL and GPL are not compatible, because GPL requires of
+  other licenses that they do "not impose any further restrictions on the
+  recipients' exercise of the rights granted herein" [GPL paragraph 6] (One
+  could argue about which license that actually imposes restrictions, but
+  that'll be left for you to ponder about.)
+
+  However, you have two alternative options:
+
+    1) Nothing prevents you from distributing your program separately from
+       curl and libcurl, and request that the user receives it separately.
+       The incompability issues between MPL and GPL only applies to the
+       distribution.
+
+    2) Add the following exception to your distribution (you must have the
+       consent of all the copyright holders of the source code in your
+       project in order to do this) 
+
+         As a special exception, you have permission to link this program
+         with the curl library and distribute executables, as long as you
+         follow the requirements of the GNU GPL in regard to all of the
+         software in the executable aside from curl.
+
+       This exception must be added to your GPL covered source code files
+       immediately after the notification mentioned in the appendix of GPL.
+       The wording was originally suggested by the Free Software Foundation
+       in relationship with the Qt library. We have changed the wording to
+       apply to curl.
+
+  6.2. I have a closed-source program, can I use the libcurl library?
+
+    Yes, libcurl does not put any restrictions on the program that uses the
+    library. If you end up doing changes to the library, only those changes
+    must be made available, not the ones to your program.
+
+  6.3. I have a BSD licensed program, can I use the libcurl library?
+
+    Yes, libcurl does not put any restrictions on the program that uses the
+    library. If you end up doing changes to the library, only those changes
+    must be made available, not the ones to your program.
+
+  6.4. I have a program that uses LGPL libraries, can I use libcurl?
+
+    Yes you can. LGPL libraries don't spread to other libraries the same way
+    GPL ones do.
+
+    However, when you read paragraph (3) of the LGPL license, you'll see that
+    anyone - at will - may at any time convert that LGPL program into GPL. And
+    GPL programs can't be distributed together with MPL programs, neither with
+    (lib)curl source code and not as a binary.
+
+  6.5. Can I modify curl/libcurl for my program and keep the changes secret?
+
+    No, you're not allowed to do that.
+
+  6.6. Can you please change the curl/libcurl license to XXXX?
+
+    No. We carefully picked this license years ago and a large amount of
+    people have contributed with source code knowing that this is the license
+    we use. This license puts the restrictions we want on curl/libcurl and it
+    does not spread to other programs or libraries that use it.

docs/FEATURES

@@ -31,7 +31,7 @@ HTTP
  - custom HTTP request
  - cookie get/send
  - understands the netscape cookie file
- - custom headers (that can replace internally generated headers)
+ - custom headers (that can replace/remove internally generated headers)
  - custom user-agent string
  - custom referer string
  - range
@@ -57,7 +57,7 @@ FTP
  - upload via http-proxy as HTTP PUT
  - download resume
  - upload resume
- - QUOT commands (before and/or after the transfer)
+ - custom ftp commands (before and/or after the transfer)
  - simple "range" support
  - via http-proxy
 

docs/INSTALL

@@ -7,51 +7,55 @@
                                 How To Compile
 
 Curl has been compiled and built on numerous different operating systems. The
-way to proceed is mainly devided in two different ways: the unix way or the
+way to proceed is mainly divided in two different ways: the unix way or the
 windows way.
 
 If you're using Windows (95, 98, NT) or OS/2, you should continue reading from
 the Win32 header below. All other systems should be capable of being installed
-as described un the the UNIX header.
+as described in the the UNIX header.
 
 PORTS
 =====
    Just to show off, this is a probably incomplete list of known hardware and
    operating systems that curl has been compiled for:
 
+        - Ultrix
+        - SINIX-Z v5
+        Alpha DEC OSF 4
+        Alpha Digital UNIX V3.2D-1 (rev 41)
+        HP-PA HP-UX 10.X 11.X
+        MIPS IRIX 6.2, 6.5
+        Power AIX 4.2, 4.3.1, 4.3.2
+        PowerPC Darwin 1.0
+        PowerPC Mac OS X
         Sparc Solaris 2.4, 2.5, 2.5.1, 2.6, 7
         Sparc SunOS 4.1.*
-        i386 Linux 1.3, 2.0, 2.2
-        MIPS IRIX 6.2, 6.5
-        HP-PA HP-UX
-        Alpha DEC OSF 4
-        i386 Solaris 2.7
-        PowerPC Mac OS X
-        Power AIX 4.3.1
-        - Ultrix
+        i386 BeOS
         i386 FreeBSD
+        i386 Linux 1.3, 2.0, 2.2
         i386 NetBSD
-        i386 OpenBSD
-        m68k OpenBSD
-        i386 Windows 95, 98, NT
         i386 OS/2
+        i386 OpenBSD
+        i386 Solaris 2.7
+        i386 Windows 95, 98, NT
         m68k AmigaOS 3
+        m68k OpenBSD
 
 UNIX
 ====
 
    The configure script *always* tries to find a working SSL library unless
-   explicitely told not to.  If you have SSLeay or OpenSSL installed in the
-   default search path for your compiler/linker, you don't need to do anything
+   explicitly told not to.  If you have OpenSSL installed in the default
+   search path for your compiler/linker, you don't need to do anything
    special.
 
-   If you have SSLeay or OpenSSL installed in /usr/local/ssl, you can
-   run configure like so:
+   If you have OpenSSL installed in /usr/local/ssl, you can run configure
+   like:
 
 	./configure --with-ssl
 
-   If you have SSLeay or OpenSSL installed somewhere else (for example,
-   /opt/OpenSSL,) you can run configure like this:
+   If you have OpenSSL installed somewhere else (for example, /opt/OpenSSL,)
+   you can run configure like this:
 
 	./configure --with-ssl=/opt/OpenSSL
 
@@ -60,10 +64,10 @@ UNIX
 
         ./configure --without-ssl
 
-   If you have SSLeay or OpenSSL installed, but with the libraries in
-   one place and the header files somewhere else, you'll have to set the
-   LDFLAGS and CPPFLAGS environment variables prior to running configure.
-   Something like this should work:
+   If you have OpenSSL installed, but with the libraries in one place and the
+   header files somewhere else, you'll have to set the LDFLAGS and CPPFLAGS
+   environment variables prior to running configure.  Something like this
+   should work:
 
      (with the Bourne shell and its clones):
 
@@ -193,9 +197,9 @@ Win32
 
       Microsoft / Borland style
       -------------------------
-        If you have OpenSSL/SSLeay, and want curl to take advantage of it,
-        edit your project properties to use the SSL include path, link with
-        the SSL libs and define the USE_SSLEAY symbol.
+        If you have OpenSSL, and want curl to take advantage of it, edit your
+        project properties to use the SSL include path, link with the SSL libs
+        and define the USE_SSLEAY symbol.
 
 
 IBM OS/2
@@ -213,10 +217,10 @@ IBM OS/2
       - GNU sed
       - autoconf 2.13
 
-   If you want to build with OpenSSL, SSLeay, or OpenLDAP support, you'll
-   need to download those libraries, too. Dirk Ohme has done some work to
-   port SSL libraries under OS/2, but it looks like he doesn't care about emx.
-   You'll find his patches on: http://come.to/Dirk.Ohme
+   If you want to build with OpenSSL or OpenLDAP support, you'll need to
+   download those libraries, too. Dirk Ohme has done some work to port SSL
+   libraries under OS/2, but it looks like he doesn't care about emx.  You'll
+   find his patches on: http://come.to/Dirk.Ohme
 
    If during the linking you get an error about _errno being an undefined
    symbol referenced from the text segment, you need to add -D__ST_MT_ERRNO__
@@ -228,8 +232,8 @@ IBM OS/2
    If you're getting huge binaries, probably your makefiles have the -g in
    CFLAGS.
 
-OpenSSL/SSLeay
-==============
+OpenSSL
+=======
 
    You'll find OpenSSL information at:
 

docs/INTERNALS

@@ -0,0 +1,160 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+INTERNALS
+
+ The project is kind of split in two. The library and the client. The client
+ part uses the library, but the library is meant to be designed to allow other
+ applications to use it.
+
+ Thus, the largest amount of code and complexity is in the library part.
+
+Windows vs Unix
+===============
+
+ There are a few differences in how to program curl the unix way compared to
+ the Windows way. The four most notable details are:
+
+ 1. Different function names for close(), read(), write()
+ 2. Windows requires a couple of init calls for the socket stuff
+ 3. The file descriptors for network communication and file operations are
+    not easily interchangable as in unix
+ 4. When writing data to stdout, Windows makes end-of-lines the DOS way, thus
+    destroying binary data, although you do want that conversion if it is
+    text coming through... (sigh)
+
+ In curl, (1) is made with defines and macros, so that the source looks the
+ same at all places except for the header file that defines them.
+
+ (2) must be made by the application that uses libcurl, in curl that means
+ src/main.c has some code #ifdef'ed to do just that.
+
+ (3) is simply avoided by not trying any funny tricks on file descriptors.
+
+ (4) is left alone, giving windows users problems when they pipe binary data
+ through stdout...
+
+ Inside the source code, I do make an effort to avoid '#ifdef WIN32'. All
+ conditionals that deal with features *should* instead be in the format
+ '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
+ I maintain two config-win32.h files (one in / and one in src/) that are
+ supposed to look exactly as a config.h file would have looked like on a
+ Windows machine!
+
+Library
+=======
+
+ As described elsewhere, libcurl is meant to get two different "layers" of
+ interface. At the present point only the high-level, the "easy", interface
+ has been fully implemented and thus documented. We assume the easy-interface
+ in this description, the low-level interface will be documented when fully
+ implemented.
+
+ There are plenty of entry points to the library, namely each publicly defined
+ function that libcurl offers to applications. All of those functions are
+ rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
+ put in the lib/easy.c file.
+
+ curl_easy_setopt() takes a three arguments, where the option stuff must be
+ passed in pairs, the parameter-ID and the parameter-value. The list of
+ options is documented in the man page.
+
+ curl_easy_perform() does a whole lot of things.
+
+ The function analyzes the URL, get the different components and connects to
+ the remote host. This may involve using a proxy and/or using SSL. The
+ GetHost() function in lib/hostip.c is used for looking up host names.
+
+ When connected, the proper function is called. The functions are named after
+ the protocols they handle. ftp(), http(), dict(), etc. They all reside in
+ their respective files (ftp.c, http.c and dict.c).
+
+ The protocol-specific functions deal with protocol-specific negotiations and
+ setup. They have access to the sendf() (from lib/sendf.c) function to send
+ printf-style formatted data to the remote host and when they're ready to make
+ the actual file transfer they call the Transfer() function (in
+ lib/download.c) to do the transfer. All printf()-style functions use the
+ supplied clones in lib/mprintf.c.
+
+ While transfering, the progress functions in lib/progress.c are called at a
+ frequent interval (or at the user's choice, a specified callback might get
+ called). The speedcheck functions in lib/speedcheck.c are also used to verify
+ that the transfer is as fast as required.
+
+ When the operation is done, the writeout() function in lib/writeout.c may be
+ called to report about the operation as specified previously in the arguments
+ to curl_easy_setopt().
+
+ When completed curl_easy_cleanup() should be called to free up used
+ resources.
+
+ HTTP(S)
+
+ HTTP offers a lot and is the protocol in curl that uses the most lines of
+ code. There is a special file (lib/formdata.c) that offers all the multipart
+ post functions.
+
+ base64-functions for user+password stuff is in (lib/base64.c) and all
+ functions for parsing and sending cookies are found in
+ (lib/cookie.c).
+
+ HTTPS uses in almost every means the same procedure as HTTP, with only two
+ exceptions: the connect procedure is different and the function used to read
+ or write from the socket is different, although the latter fact is hidden in
+ the source by the use of curl_read() for reading and curl_write() for writing
+ data to the remote server.
+
+ FTP
+
+ The if2ip() function can be used for getting the IP number of a specified
+ network interface, and it resides in lib/if2ip.c. It is only used for the FTP
+ PORT command.
+
+ TELNET
+
+ Telnet is implemented in lib/telnet.c.
+
+ FILE
+
+ The file:// protocol is dealt with in lib/file.c.
+
+ LDAP
+
+ Everything LDAP is in lib/ldap.c.
+
+ GENERAL
+
+ URL encoding and decoding, called escaping and unescaping in the source code,
+ is found in lib/escape.c.
+
+ While transfering data in Transfer() a few functions might get
+ used. curl_getdate() in lib/getdate.c is for HTTP date comparisons (and
+ more).
+
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
+ in a neat platform independent way. That's used in the client, but also in
+ lib/url.c when checking the PROXY variables.
+
+ lib/netrc.c keeps the .netrc parser
+
+ lib/timeval.c features replacement functions for systems that don't have
+ 
+ A function named curl_version() that returns the full curl version string is
+ found in lib/version.c.
+
+Client
+======
+
+ main() resides in src/main.c together with most of the client
+ code. src/hugehelp.c is automatically generated by the mkhelp.pl perl script
+ to display the complete "manual" and the src/urlglob.c file holds the
+ functions used for the multiple-URL support.
+
+ The client mostly mess around to setup its config struct properly, then it
+ calls the curl_easy_*() functions of the library and when it gets back
+ control after the curl_easy_perform() it cleans up the library, checks status
+ and exits.
+

docs/Makefile.am

@@ -0,0 +1,21 @@
+#
+# $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+man_MANS = \
+	curl.1 \
+	curl_easy_cleanup.3 \
+	curl_easy_init.3 \
+	curl_easy_perform.3 \
+	curl_easy_setopt.3 \
+	curl_formparse.3 \
+	curl_getdate.3 \
+	curl_getenv.3 \
+	curl_slist_append.3 \
+	curl_slist_free_all.3 \
+	curl_version.3
+
+EXTRA_DIST = $(man_MANS)
+

docs/README.curl

@@ -3,7 +3,7 @@ LATEST VERSION
   You always find news about what's going on as well as the latest versions
   from the curl web pages, located at:
 
-        http://curl.haxx.nu
+        http://curl.haxx.se
 
 SIMPLE USAGE
 
@@ -178,7 +178,7 @@ DETAILED INFORMATION
 
   Store the HTTP headers in a separate file:
 
-        curl --dump-header headers.txt curl.haxx.nu
+        curl --dump-header headers.txt curl.haxx.se
 
   Note that headers stored in a separate file can be very useful at a later
   time if you want curl to use cookies sent by the server. More about that in
@@ -194,6 +194,41 @@ POST (HTTP)
         curl -d "name=Rafael%20Sagula&phone=3320780" \
                 http://www.where.com/guest.cgi
 
+  How to post a form with curl, lesson #1:
+
+  Dig out all the <input> tags in the form that you want to fill in. (There's
+  a perl program called formfind.pl on the curl site that helps with this).
+
+  If there's a "normal" post, you use -d to post. -d takes a full "post
+  string", which is in the format
+
+        <variable1>=<data1>&<variable2>=<data2>&...
+
+  The 'variable' names are the names set with "name=" in the <input> tags, and
+  the data is the contents you want to fill in for the inputs. The data *must*
+  be properly URL encoded. That means you replace space with + and that you
+  write weird letters with %XX where XX is the hexadecimal representation of
+  the letter's ASCII code.
+
+  Example:
+
+  (page located at http://www.formpost.com/getthis/
+
+        <form action="post.cgi" method="post">
+        <input name=user size=10>
+        <input name=pass type=password size=10>
+        <input name=id type=hidden value="blablabla">
+        <input name=ding value="submit">
+        </form>
+
+  We want to enter user 'foobar' with password '12345'.
+
+  To post to this, you enter a curl command line like:
+
+        curl -d "user=foobar&pass=12345&id=blablabla&dig=submit"  (continues)
+          http://www.formpost.com/getthis/post.cgi
+
+
   While -d uses the application/x-www-form-urlencoded mime-type, generally
   understood by CGI's and similar, curl also supports the more capable
   multipart/form-data type. This latter type supports things like file upload.
@@ -499,6 +534,26 @@ HTTPS
 
   Otherwise, curl will first attempt to use v3 and then v2.
 
+  To use OpenSSL to convert your favourite browser's certificate into a PEM
+  formatted one that curl can use, do something like this (assuming netscape,
+  but IE is likely to work similarly):
+
+    You start with hitting the 'security' menu button in netscape. 
+
+    Select 'certificates->yours' and then pick a certificate in the list 
+
+    Press the 'export' button 
+
+    enter your PIN code for the certs 
+
+    select a proper place to save it 
+
+    Run the 'openssl' application to convert the certificate. If you cd to the
+    openssl installation, you can do it like:
+
+     # ./apps/openssl pkcs12 -certfile [file you saved] -out [PEMfile]
+
+
 RESUMING FILE TRANSFERS
 
  To continue a file transfer where it was previously aborted, curl supports
@@ -621,7 +676,7 @@ NETRC
 
   A very simple .netrc file could look something like:
 
-        machine curl.haxx.nu login iamdaniel password mysecret
+        machine curl.haxx.se login iamdaniel password mysecret
 
 CUSTOM OUTPUT
 

docs/README.libcurl

@@ -0,0 +1,61 @@
+                         _ _ _                     _ 
+                        | (_) |__   ___ _   _ _ __| |
+                        | | | '_ \ / __| | | | '__| |
+                        | | | |_) | (__| |_| | |  | |
+                        |_|_|_.__/ \___|\__,_|_|  |_|
+
+
+                     How To Use Libcurl In Your Program
+
+Interfaces
+
+ libcurl currently offers two different interfaces to the URL transfer
+ engine. They can be seen as one low-level and one high-level, in the sense
+ that the low-level one will allow you to deal with a lot more details but on
+ the other hand not offer as many fancy features (such as Location:
+ following). The high-level interface is supposed to be a built-in
+ implementation of the low-level interface. You will not be able to mix
+ function calls from the different layers.
+
+ As we currently ONLY support the high-level interface, the so called easy
+ interface, I will not attempt to describe any low-level functions at this
+ point.
+
+Function descriptions
+
+ The interface is meant to be very simple for very simple
+ implementations. Thus, we have minimized the number of entries.
+
+The Easy Interface
+
+ When using the easy interface, you init your easy-session and get a handle,
+ which you use as input to the following interface functions you use.
+
+ You continue by setting all the options you want in the upcoming transfer,
+ most important among them is the URL itself. You might want to set some
+ callbacks as well that will be called from the library when data is available
+ etc.
+
+ When all is setup, you tell libcurl to perform the transfer. It will then do
+ the entire operation and won't return until it is done or failed.
+
+ After the transfer has been made, you cleanup the easy-session's handle and
+ libcurl is entirely off the hook!
+
+        curl_easy_init() 
+        curl_easy_setopt() 
+        curl_easy_perform() 
+        curl_easy_cleanup() 
+
+ While the above four functions are the main functions to use in the easy
+ interface, there is a series of helpful functions to use. They are:
+
+        curl_version()        - displays the libcurl version
+        curl_getdate()        - converts a date string to time_t
+        curl_getenv()         - portable environment variable reader
+        curl_formparse()      - helps building a HTTP form POST
+        curl_slist_append()   - builds a linked list
+        curl_slist_free_all() - frees a whole curl_slist
+
+ Read the separate man pages for these functions for details!
+

docs/README.win32

@@ -0,0 +1,19 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+README.win32
+
+  Read the README file first.
+
+  Curl has been compiled, built and run on all sorts of Windows and win32
+  systems. While not being the main develop target, a fair share of curl users
+  are win32-based.
+
+  Some documentation in this archive will be tricky to read for Windows
+  people, as they come in unix-style man pages. You can either download a
+  freely available nroff binary for win32 (*pointers appriciated*), convert
+  the files into plain-text on your neighbor's unix machine or run over to the
+  curl web site and view them as plain HTML.

docs/RESOURCES

@@ -6,57 +6,102 @@
 
 
 This document has been introduced in order to let you find documents that
-specify standards used by curl, software that extends curl and web pages with
-"competing" utilities.
+specify standards used by curl, software that extends curl, web pages with
+"competing" utilities and information pages that describe some of the tools
+that we use to build/compile/develop curl.
 
 Standards
+---------
 
   RFC 959  - Defines how FTP works
+
   RFC 1738 - Uniform Resource Locators
+
   RFC 1777 - defines the LDAP protocol
+
   RFC 1808 - Relative Uniform Resource Locators
+
   RFC 1867 - Form-based File Upload in HTML
 
   RFC 1950 - ZLIB Compressed Data Format Specification
+
   RFC 1951 - DEFLATE Compressed Data Format Specification
+
   RFC 1952 - gzip compression format
 
   RFC 1959 - LDAP URL syntax
+
   RFC 2045-2049 - Everything you need to know about MIME! (needed for form
                   based upload)
+
   RFC 2068 - HTTP 1.1 (obsoleted by RFC 2616)
+
   RFC 2109 - HTTP State Management Mechanism (cookie stuff)
            - Also, read Netscape's specification at
              http://www.netscape.com/newsref/std/cookie_spec.html
+
   RFC 2183 - "The Content-Disposition Header Field"
+
   RFC 2229 - "A Dictionary Server Protocol"
+
+  RFC 2255 - Newer LDAP URL syntax document.
+
   RFC 2231 - "MIME Parameter Value and Encoded Word Extensions:
              Character Sets, Languages, and Continuations"
+
   RFC 2388 - "Returning Values from Forms: multipart/form-data"
              Use this as an addition to the 1867 
-  RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" 
-   This one obsoletes 1738, but since 1738 is often mentioned I've left it
-   in this list.
+
+  RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" This
+             one obsoletes 1738, but since 1738 is often mentioned I've left
+             it in this list.
+
   RFC 2428 - "FTP Extensions for IPv6 and NATs"
-   This should be considered when introducing IPv6 awareness.
-  RFC 2616 - HTTP 1.1
+
+  RFC 2616 - HTTP 1.1, the latest
+
   RFC 2617 - HTTP Authentication
 
-Compilers
+  RFC 2718 - "Guidelines for new URL Schemes"
 
-  MingW32 - http://www.xraylith.wisc.edu/~khan/software/gnu-win32/index.html
+  RFC 2732 - "Format for Literal IPv6 Addresses in URL's"
+
+Compilers
+---------
+  MingW32 - http://www.mingw.org
+
+  gcc     - http://www.gnu.org/software/gcc/gcc.html
 
 Software
-
+--------
   OpenSSL -  http://www.openssl.org
+
   OpenLDAP - http://www.openldap.org
+
   zlib -     http://www.cdrom.com/pub/infozip/zlib/
 
-Competitors
+Similar Tools
+-------------
+  wget    - http://www.gnu.org/software/wget/wget.html
 
-  wget    - ftp://prep.ai.mit.edu/pub/gnu/
   snarf   - http://www.xach.com/snarf/
-  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
-  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
-  fetch   - ?
 
+  lynx    - http://lynx.browser.org/ (well at least when -dump is used)
+
+  swebget - http://www.uni-hildesheim.de/~smol0075/swebget/
+
+Related Software
+----------------
+  ftpparse - http://cr.yp.to/ftpparse.html parses FTP LIST responses
+
+  autoconf - http://www.gnu.org/software/autoconf/autoconf.html
+
+  automake - http://www.gnu.org/software/automake/automake.html
+
+  bison    - http://www.gnu.org/software/bison/bison.html
+
+  gzip     - http://www.gnu.org/software/gzip/gzip.html
+
+  tar      - http://www.gnu.org/software/tar/tar.html
+
+  libtool  - http://www.gnu.org/software/libtool/libtool.html

docs/TODO

@@ -6,14 +6,27 @@
 
 TODO
 
+For the future
+
  Ok, this is what I wanna do with Curl. Please tell me what you think, and
  please don't hesitate to contribute and send me patches that improve this
  product! (Yes, you may add things not mentioned here, these are just a
  few teasers...)
 
- * rtsp:// support -- "Real Time Streaming Protocol"
+ * Make sure the low-level interface works. highlevel.c should basically be
+   possible to write using that interface. Document the low-level interface
 
-   RFC 2326
+ * Add asynchronous name resolving, as this enables full timeout support for
+   fork() systems.
+
+ * Move non-URL related functions that are used by both the lib and the curl
+   application to a separate "portability lib".
+
+ * Add support for other languages than C (not important)
+
+ * Improve the -K config file parser.
+
+ * rtsp:// support -- "Real Time Streaming Protocol" (RFC 2326)
 
  * "Content-Encoding: compress/gzip/zlib"
 
@@ -72,16 +85,13 @@ TODO
  * Other proxies
    Ftp-kind proxy, Socks5, whatever kind of proxies are there?
 
- * IPv6 Awareness
+ * IPv6 Awareness and support
    Where ever it would fit. I am not that into v6 yet to fully grasp what we
    would need to do, but letting the autoconf search for v6-versions of a few
    functions and then use them instead is of course the first thing to do...
    RFC 2428 "FTP Extensions for IPv6 and NATs" will be interesting. PORT
    should be replaced with EPRT for IPv6, and EPSV instead of PASV.
 
- * An automatic RPM package maker
-   Please, write me a script that makes it. It'd make my day.
-
  * SSL for more protocols, like SSL-FTP...
    (http://search.ietf.org/internet-drafts/draft-murray-auth-ftp-ssl-05.txt)
 
@@ -90,4 +100,5 @@ TODO
  * Make curl capable of verifying the server's certificate when connecting
    with HTTPS://.
 
- * Make the timeout work as expected!
+ * Kerberos-FTP
+

docs/TheArtOfHttpScripting

@@ -0,0 +1,345 @@
+Author:  Daniel Stenberg <daniel@haxx.se>
+Date:    August 7, 2000
+Version: 0.2
+
+                The Art Of Scripting HTTP Requests Using Curl
+                =============================================
+
+ This document will assume that you're familiar with HTML and general
+ networking.
+
+ The possibility to write scripts is essential to make a good computer
+ system. Unix' capability to be extended by shell scripts and various tools to
+ run various automated commands and scripts is one reason why it has succeeded
+ so well.
+
+ The increasing amount of applications moving to the web has made "HTTP
+ Scripting" more frequently requested and wanted. To be able to automatically
+ extract information from the web, to fake users, to post or upload data to
+ web servers are all important tasks today.
+
+ Curl is a command line tool for doing all sorts of URL manipulations and
+ transfers, but this particular document will focus on how to use it when
+ doing HTTP requests for fun and profit. I'll assume that you know how to
+ invoke 'curl --help' or 'curl --manual' to get basic information about it.
+
+ Curl is not written to do everything for you. It makes the requests, it gets
+ the data, it sends data and it retrieves the information. You probably need
+ to glue everything together using some kind of script language or repeated
+ manual invokes.
+
+1. The HTTP Protocol
+
+ HTTP is the protocol used to fetch data from web servers. It is a very simple
+ protocol that is built upon TCP/IP. The protocol also allow information to
+ get sent to the server from the client using a few different methods, as will
+ be shown here.
+
+ HTTP is plain ASCII text lines being sent by the client to a server to
+ request a particular action, and then the server replies a few text lines
+ before the actual requested content is sent to the client.
+
+ Using curl's option -v will display what kind of commands curl sends to the
+ server, as well as a few other informational texts. -v is the single most
+ useful option when it comes to debug or even understand the curl<->server
+ interaction.
+
+2. URL
+
+ The Uniform Resource Locator format is how you specify the address of a
+ particular resource on the internet. You know these, you've seen URLs like
+ http://curl.haxx.se or https://yourbank.com a million times.
+
+3. GET a page
+
+ The simplest and most common request/operation made using HTTP is to get a
+ URL. The URL could itself refer to a web page, an image or a file. The client
+ issues a GET request to the server and receives the document it asked for.
+ If you isse the command line
+
+        curl http://curl.haxx.se
+
+ you get a web page returned in your terminal window. The entire HTML document
+ that that URL holds.
+
+ All HTTP replies contain a set of headers that are normally hidden, use
+ curl's -i option to display them as well as the rest of the document. You can
+ also ask the remote server for ONLY the headers by using the -I option.
+
+4. Forms
+
+ Forms are the general way a web site can present a HTML page with fields for
+ the user to enter data in, and then press some kind of 'OK' or 'submit'
+ button to get that data sent to the server. The server then typically uses
+ the posted data to decide how to act. Like using the entered words to search
+ in a database, or to add the info in a bug track system, display the entered
+ address on a map or using the info as a login-prompt verifying that the user
+ is allowed to see what it is about to see.
+
+ Of course there has to be some kind of program in the server end to receive
+ the data you send. You cannot just invent something out of the air.
+
+ 4.1 GET
+
+  A GET-form uses the method GET, as specified in HTML like:
+
+        <form method="GET" action="junk.cgi">
+          <input type=text name="birthyear">
+          <input type=submit name=press value="OK">
+        </form>
+
+  In your favourite browser, this form will appear with a text box to fill in
+  and a press-button labeled "OK". If you fill in '1905' and press the OK
+  button, your browser will then create a new URL to get for you. The URL will
+  get "junk.cgi?birthyear=1905&press=OK" appended to the path part of the
+  previous URL.
+
+  If the original form was seen on the page "www.hotmail.com/when/birth.html",
+  the second page you'll get will become
+  "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK".
+
+  Most search engines work this way.
+
+  To make curl do the GET form post for you, just enter the expected created
+  URL:
+
+        curl "www.hotmail.com/when/junk.cgi?birthyear=1905&press=OK"
+
+ 4.2 POST
+
+  The GET method makes all input field names get displayed in the URL field of
+  your browser. That's generally a good thing when you want to be able to
+  bookmark that page with your given data, but it is an obvious disadvantage
+  if you entered secret information in one of the fields or if there are a
+  large amount of fields creating a very long and unreadable URL.
+
+  The HTTP protocol then offers the POST method. This way the client sends the
+  data separated from the URL and thus you won't see any of it in the URL
+  address field.
+
+  The form would look very similar to the previous one:
+
+        <form method="POST" action="junk.cgi">
+          <input type=text name="birthyear">
+          <input type=submit name=press value="OK">
+        </form>
+
+  And to use curl to post this form with the same data filled in as before, we
+  could do it like:
+
+        curl -d "birthyear=1905&press=OK" www.hotmail.com/when/junk.cgi
+
+  This kind of POST will use the Content-Type
+  application/x-www-form-urlencoded and is the most widly used POST kind.
+
+ 4.3 FILE UPLOAD POST
+
+  Back in late 1995 they defined a new to post data over HTTP. It was
+  documented in the RFC 1867, why this method sometimes are refered to as
+  a rfc1867-posting.
+
+  This method is mainly designed to better support file uploads. A form that
+  allows a user to upload a file could be written like this in HTML:
+
+    <form method="POST" enctype='multipart/form-data' action="upload.cgi">
+      <input type=file name=upload>
+      <input type=submit name=press value="OK">
+    </form>
+
+  This clearly shows that the Content-Type about to be sent is
+  multipart/form-data.
+
+  To post to a form like this with curl, you enter a command line like:
+
+        curl -F upload=@localfilename -F press=OK [URL]
+
+ 4.4 HIDDEN FIELDS
+
+  A very common way for HTML based application to pass state information
+  between pages is to add hidden fields to the forms. Hidden fields are
+  already filled in, they aren't displayed to the user and they get passed
+  along just as all the other fields.
+
+  A similar example form with one visible field, one hidden field and one
+  submit button could look like:
+
+    <form method="POST" action="foobar.cgi">
+      <input type=text name="birthyear">
+      <input type=text name="person" value="daniel">
+      <input type=submit name="press" value="OK">
+    </form>
+
+  To post this with curl, you won't have to think about if the fields are
+  hidden or not. To curl they're all the same:
+
+        curl -d "birthyear=1905&press=OK&person=daniel" [URL]
+
+5. PUT
+
+ The perhaps best way to upload data to a HTTP server is to use PUT. Then
+ again, this of course requires that someone put a program or script on the
+ server end that knows how to receive a HTTP PUT stream.
+
+ Put a file to a HTTP server with curl:
+
+        curl -t uploadfile www.uploadhttp.com/receive.cgi
+
+6. AUTHENTICATION
+
+ Authentication is the ability to tell the server your username and password
+ so that it can verify that you're allowed to do the request you're doing. The
+ basic authentication used in HTTP is *plain* *text* based, which means it
+ sends username and password only slightly obfuscated, but still fully
+ readable by anyone that sniffs on the network between you and the remote
+ server.
+
+ To tell curl to use a user and password for authentication:
+
+        curl -u name:password www.secrets.com
+ 
+ Sometimes your HTTP access is only available through the use of a HTTP
+ proxy. This seems to be especially common at various companies. A HTTP proxy
+ may require its own user and password to allow the client to get through to
+ the internet. To specify those with curl, run something like:
+
+        curl -U proxyuser:proxypassword curl.haxx.se
+
+ If you use any one these user+password options but leave out the password
+ part, curl will prompt for the password interactively.
+
+ Do note that when a program is run, its parameters are possible to see when
+ listing the running processes of the system. Thus, other users may be able to
+ watch your passwords if you pass them as plain command line options.
+
+7. REFERER
+
+ A HTTP request has the ability to feature a 'referer' field, which can be
+ used to tell which URL that causes the client to get this particular
+ resource. Some programs/scripts check the referer field of requests to verify
+ that this wasn't arriving from an external site or unknown page. While this
+ is a stupid way to check something so easily forged, many scripts still do
+ it. Using curl, you can put anything you want in the referer-field and thus
+ more easily being able to fool the server into serving your request.
+
+ Use curl to set the referer field with:
+
+        curl -e http://curl.haxx.se daniel.haxx.se
+
+8. USER AGENT
+
+ Very similar to the referer field, all HTTP requests may set the User-Agent
+ field. It names what user agent (client) that is being used. Many
+ applications use this information to decide how to display pages. Silly web
+ programmers try to make different pages for users of different browsers to
+ make them look the best possible for their particular browsers. They usually
+ also do different kinds of javascript, vbscript etc.
+
+ At times, you will see that getting a page with curl will not return the same
+ page that you see when getting the page with your browser. Then you know it
+ is time to set the User Agent field to fool the server into thinking you're
+ one of those browsers.
+
+ To make curl look like Internet Explorer on a Windows 2000 box:
+
+        curl -A "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)" [URL]
+
+ Or why not look like you're using Netscape 4.73 on a Linux (PIII) box:
+
+        curl -A "Mozilla/4.73 [en] (X11; U; Linux 2.2.15 i686)" [URL]
+
+9. REDIRECTS
+
+ When a resource is requested from a server, the reply from the server may
+ include a hint about where the browser should go next to find this page, or a
+ new page keeping newly generated output. The header that tells the browser
+ to redirect is Location:.
+
+ Curl does not follow Location: headers by default, but will simply display
+ such pages in the same manner it display all HTTP replies. It does however
+ feature an option that will make it attempt to follow the Location: pointers.
+
+ To tell curl to follow a Location: 
+ 
+        curl -L www.sitethatredirects.com
+
+ If you use curl to POST to a site that immediately redirects you to another
+ page, you can safely use -L and -d/-F together. Curl will only use POST in
+ the first request, and then revert to GET in the following operations.
+
+10. COOKIES
+
+ The way the web browsers do "client side state control" is by using
+ cookies. Cookies are just names with associated contents. The cookies are
+ sent to the client by the server. The server tells the client for what path
+ and host name it wants the cookie sent back, and it also sends an expiration
+ date and a few more properties.
+
+ When a client communicates with a server with a name and path as previously
+ specified in a received cookie, the client sends back the cookies and their
+ contents to the server, unless of course they are expired.
+
+ Many applications and server use this method to connect a series of request
+ into a single logical session. To be able to use curl in such occations, we
+ must be able to record and send back cookies in the way that the web
+ application expects them. The same way browsers deal with them.
+
+ The simplest way to send a few cookies to the server when getting a page with
+ curl is to add them on the command line like:
+
+        curl -b "name=Daniel" www.cookiesite.com
+
+
+ Cookies are sent as common HTTP headers. This is practical as it allows curl
+ to record cookies simply by recording headers. Record cookies with curl by
+ using the -D option like:
+
+        curl -D headers_and_cookies www.cookiesite.com
+
+ Curl has a full blown cookie parsing engine built-in that comes to use if you
+ want to reconnect to a server and use cookies that were stored from a
+ previous connection (or handicrafted manually to fool the server into
+ believing you had a previous connection). To use previously stored cookies,
+ you run curl like:
+
+        curl -b stored_cookies_in_file www.cookiesite.com
+
+11. HTTPS
+
+ There are a few ways to do secure HTTP transfers. The by far most common
+ protocol for doing this is what is generally known as HTTPS, HTTP over
+ SSL. SSL encrypts all the data that is send and received over the network and
+ thus makes it harder for attackers to spy on sensitive information.
+
+ SSL (or TLS as the latest version of the standard is called) offers a
+ truckload of advanced features to allow all those encryptions and key
+ infrastructure mechanisms ecnrypted HTTP requires.
+
+ Curl supports enscrypted fetches thanks to the freely available OpenSSL
+ libraries. To get a pafe from a https server, simply run curl like:
+
+        curl https://that.secure.server.com
+
+ 11.1 CERTIFICATES
+
+  In the HTTPS world, you use certificates to validate that you are the one
+  you you claim to be, as an addition to normal passwords. Curl supports
+  client-side certificates. All certificates are locked with a PIN-code, why
+  you need to enter the unlock-code before the certificate can be used by
+  curl. The PIN-code can be specified on the command line or if not, entered
+  interactively when curl queries for it. Use a certificate with curl on a
+  https server like:
+
+        curl -E mycert.pem https://that.secure.server.com
+
+12. REFERENCES
+
+ RFC 2616 is a must to read if you want in-depth understanding of the HTTP
+ protocol.
+
+ RFC 2396 explains the URL syntax
+
+ RFC 2109 defines how cookies are supposed to work.
+
+ http://www.openssl.org is the home of the OpenSSL project
+
+ http://curl.haxx.se is the home of the cURL project

docs/curl.1

@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "13 March 2000" "Curl 6.5" "Curl Manual"
+.TH curl 1 "24 August 2000" "Curl 7.2" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 HTTPS syntax.
@@ -67,10 +67,10 @@ format.
 that the file specified with -b/--cookie is only used as input. No cookies
 will be stored in the file. To store cookies, save the HTTP headers to a file
 using -D/--dump-header!
-.IP "-B/--ftp-ascii"
-(FTP/LDAP)
+.IP "-B/--use-ascii"
 Use ASCII transfer when getting an FTP file or LDAP info. For FTP, this can
-also be enforced by using an URL that ends with ";type=A".
+also be enforced by using an URL that ends with ";type=A". This option causes
+data sent to stdout to be in text mode for win32 systems.
 .IP "-c/--continue"
 Continue/Resume a previous file transfer. This instructs curl to
 continue appending data on the file where it was previously left,
@@ -88,16 +88,26 @@ If used with uploads, the ftp server command SIZE will not be used by
 curl. Upload resume is for FTP only.
 HTTP resume is only possible with HTTP/1.1 or later servers.
 .IP "-d/--data <data>"
-(HTTP)
-Sends the specified data in a POST request to the HTTP server. Note
-that the data is sent exactly as specified with no extra processing.
-The data is expected to be "url-encoded". This will cause curl to
-pass the data to the server using the content-type
+(HTTP) Sends the specified data in a POST request to the HTTP server. Note
+that the data is sent exactly as specified with no extra processing (with all
+newlines cut off).  The data is expected to be "url-encoded". This will cause
+curl to pass the data to the server using the content-type
 application/x-www-form-urlencoded. Compare to -F.
 
 If you start the data with the letter @, the rest should be a file name to
 read the data from, or - if you want curl to read the data from stdin.
 The contents of the file must already be url-encoded.
+
+To post data purely binary, you should instead use the --data-binary option.
+
+-d/--data is the same as --data-ascii.
+.IP "--data-ascii <data>"
+(HTTP) This is an alias for the -d/--data option.
+.IP "--data-binary <data>"
+(HTTP) This posts data in a similar manner as --data-ascii does, although when
+using this option the entire context of the posted data is kept as-is. If you
+want to post a binary file without the strip-newlines feature of the
+--data-ascii option, this is for you.
 .IP "-D/--dump-header <file>"
 (HTTP/FTP)
 Write the HTTP headers to this file. Write the FTP file info to this
@@ -107,10 +117,12 @@ This option is handy to use when you want to store the cookies that a HTTP
 site sends to you. The cookies could then be read in a second curl invoke by
 using the -b/--cookie option!
 .IP "-e/--referer <URL>"
-(HTTP)
-Sends the "Referer Page" information to the HTTP server. Some badly
-done CGIs fail if it's not set. This can also be set with the -H/--header
-flag of course.
+(HTTP) Sends the "Referer Page" information to the HTTP server. This can also
+be set with the -H/--header flag of course.  When used with
+.I -L/--location 
+you can append ";auto" to the referer URL to make curl automatically set the
+previous URL when it follows a Location: header. The ";auto" string can be
+used alone, even if you don't set an initial referer.
 .IP "-E/--cert <certificate[:password]>"
 (HTTPS)
 Tells curl to use the specified certificate file when getting a file
@@ -127,30 +139,35 @@ document, it returns a HTML document stating so (which often also
 describes why and more). This flag will prevent curl from
 outputting that and fail silently instead.
 .IP "-F/--form <name=content>"
-(HTTP)
-This lets curl emulate a filled in form in which a user has pressed
-the submit button. This causes curl to POST data using the
-content-type multipart/form-data according to RFC1867. This enables
-uploading of binary files etc. To force the 'content' part to be
-read from a file, prefix the file name with an @ sign. Example, to
-send your password file to the server, where 'password' is the
-name of the form-field to which /etc/passwd will be the input:
+(HTTP) This lets curl emulate a filled in form in which a user has pressed the
+submit button. This causes curl to POST data using the content-type
+multipart/form-data according to RFC1867. This enables uploading of binary
+files etc. To force the 'content' part to be be a file, prefix the file name
+with an @ sign. To just get the content part from a file, prefix the file name
+with the letter <. The difference between @ and < is then that @ makes a file
+get attached in the post as a file upload, while the < makes a text field and
+just get the contents for that text field from a file.
+
+Example, to send your password file to the server, where
+'password' is the name of the form-field to which /etc/passwd will be the
+input:
 
 .B curl
 -F password=@/etc/passwd www.mypasswords.com
 
 To read the file's content from stdin insted of a file, use - where the file
-name should've been.
+name should've been. This goes for both @ and < constructs.
 .IP "-h/--help"
 Usage help.
 .IP "-H/--header <header>"
-(HTTP)
-Extra header to use when getting a web page. You may specify any number of
-extra headers. Note that if you should add a custom header that has the same
-name as one of the internal ones curl would use, your externally set header
-will be used instead of the internal one. This allows you to make even
+(HTTP) Extra header to use when getting a web page. You may specify any number
+of extra headers. Note that if you should add a custom header that has the
+same name as one of the internal ones curl would use, your externally set
+header will be used instead of the internal one. This allows you to make even
 trickier stuff than curl would normally do. You should not replace internally
-set headers without knowing perfectly well what you're doing.
+set headers without knowing perfectly well what you're doing. Replacing an
+internal header with one without content on the right side of the colon will
+prevent that header from appearing.
 .IP "-i/--include"
 (HTTP)
 Include the HTTP-header in the output. The HTTP-header includes things
@@ -175,16 +192,16 @@ Especially useful if you want to machine-parse the contents of an FTP
 directory since the normal directory view doesn't use a standard look
 or format.
 .IP "-L/--location"
-(HTTP/HTTPS)
-If the server reports that the requested page has a different location
-(indicated with the header line Location:) this flag will let curl
-attempt to reattempt the get on the new place. If used together with
--i or -I, headers from all requested pages will be shown.
+(HTTP/HTTPS) If the server reports that the requested page has a different
+location (indicated with the header line Location:) this flag will let curl
+attempt to reattempt the get on the new place. If used together with -i or -I,
+headers from all requested pages will be shown. If this flag is used when
+making a HTTP POST, curl will automatically switch to GET after the initial
+POST has been done.
 .IP "-m/--max-time <seconds>"
-Maximum time in seconds that you allow the whole operation to take.
-This is useful for preventing your batch jobs from hanging for hours
-due to slow networks or links going down.
-This doesn't work properly in win32 systems.
+Maximum time in seconds that you allow the whole operation to take.  This is
+useful for preventing your batch jobs from hanging for hours due to slow
+networks or links going down.  This doesn't work fully in win32 systems.
 .IP "-M/--manual"
 Manual. Display the huge help text.
 .IP "-n/--netrc"
@@ -193,7 +210,7 @@ Makes curl scan the
 file in the user's home directory for login name and password. This is
 typically used for ftp on unix. If used with http, curl will enable user
 authentication. See
-.BR netrc(5)
+.BR netrc(4)
 for details on the file format. Curl will not complain if that file
 hasn't the right permissions (it should not be world nor group
 readable). The environment variable "HOME" is used to find the home
@@ -204,7 +221,7 @@ A quick and very simple example of how to setup a
 to allow curl to ftp to the machine host.domain.com with user name
 'myself' and password 'secret' should look similar to:
 
-.B "machine host.domain.com user myself password secret"
+.B "machine host.domain.com login myself password secret"
 .IP "-N/--no-buffer"
 Disables the buffering of the output stream. In normal work situations, curl
 will use a standard buffered output stream that will have the effect that it
@@ -409,7 +426,9 @@ date, or one that has been modified before that time. The date expression can
 be all sorts of date strings or if it doesn't match any internal ones, it
 tries to get the time from a given file name instead! See the
 .BR "GNU date(1)"
-man page for date expression details.
+or
+.BR "curl_getdate(3)"
+man pages for date expression details.
 
 Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
@@ -546,18 +565,18 @@ There will appear more error codes here in future releases. The existing ones
 are meant to never change.
 .SH BUGS
 If you do find any (or have other suggestions), mail Daniel Stenberg
-<Daniel.Stenberg@haxx.nu>.
+<Daniel.Stenberg@haxx.se>.
 .SH AUTHORS / CONTRIBUTORS
- - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ - Daniel Stenberg <Daniel.Stenberg@haxx.se>
  - Rafael Sagula <sagula@inf.ufrgs.br>
  - Sampo Kellomaki <sampo@iki.fi>
  - Linas Vepstas <linas@linas.org>
  - Bjorn Reese <breese@mail1.stofanet.dk>
  - Johan Anderson <johan@homemail.com>
- - Kjell Ericson <Kjell.Ericson@haxx,nu>
+ - Kjell Ericson <Kjell.Ericson@haxx.se>
  - Troy Engel <tengel@sonic.net>
  - Ryan Nelson <ryan@inch.com>
- - Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
+ - Björn Stenberg <Bjorn.Stenberg@haxx.se>
  - Angus Mackay <amackay@gus.ml.org>
  - Eric Young <eay@cryptsoft.com>
  - Simon Dick <simond@totally.irrelevant.org>
@@ -575,9 +594,9 @@ If you do find any (or have other suggestions), mail Daniel Stenberg
  - Ralph Beckmann <rabe@uni-paderborn.de>
  - T. Yamada <tai@imasy.or.jp>
  - Lars J. Aas <larsa@sim.no>
- - Jörn Hartroth <Joern.Hartroth@telekom.de>
+ - Jörn Hartroth <Joern.Hartroth@computer.org>
  - Matthew Clarke <clamat@van.maves.ca>
- - Linus Nielsen <Linus.Nielsen@haxx.nu>
+ - Linus Nielsen <Linus.Nielsen@haxx.se>
  - Felix von Leitner <felix@convergence.de>
  - Dan Zitter <dzitter@zitter.net>
  - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
@@ -588,8 +607,18 @@ If you do find any (or have other suggestions), mail Daniel Stenberg
  - Damien Adant <dams@usa.net>
  - Chris <cbayliss@csc.come>
  - Marco G. Salvagno <mgs@whiz.cjb.net>
+ - Paul Marquis <pmarquis@iname.com>
+ - David LeBlanc <dleblanc@qnx.com>
+ - Rich Gray at Plus Technologies
+ - Luong Dinh Dung <u8luong@lhsystems.hu>
+ - Torsten Foertsch <torsten.foertsch@gmx.net>
+ - Kristian Köhntopp <kris@koehntopp.de>
+ - Fred Noz <FNoz@siac.com>
+ - Caolan McNamara <caolan@csn.ul.ie>
+ - Albert Chin-A-Young <china@thewrittenword.com>
+
 .SH WWW
-http://curl.haxx.nu
+http://curl.haxx.se
 .SH FTP
 ftp://ftp.sunet.se/pub/www/utilities/curl/
 .SH "SEE ALSO"

docs/curl_easy_cleanup.3

@@ -0,0 +1,25 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_easy_cleanup 3 "22 May 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_easy_cleanup - End a libcurl "easy" session
+.SH SYNOPSIS
+.B #include <curl/easy.h>
+.sp
+.BI "curl_easy_cleanup(CURL *" handle ");
+.ad
+.SH DESCRIPTION
+This function must be the last function to call for a curl session. It is the
+opposite of the
+.I curl_easy_init
+function and must be called with the same
+.I handle
+as input as the curl_easy_init call returned.
+.SH RETURN VALUE
+None
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), "
+.SH BUGS
+Surely there are some, you tell me!

docs/curl_easy_init.3

@@ -0,0 +1,25 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_easy_init 3 "22 May 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_easy_init - Start a libcurl "easy" session
+.SH SYNOPSIS
+.B #include <curl/easy.h>
+.sp
+.BI "CURL *curl_easy_init( );"
+.ad
+.SH DESCRIPTION
+This function must be the first function to call, and it returns a CURL handle
+that you shall use as input to the other easy-functions. The init calls
+intializes curl and this call MUST have a corresponding call to
+.I curl_easy_cleanup
+when the operation is complete.
+.SH RETURN VALUE
+If this function returns NULL, something went wrong and you cannot use the
+other curl functions.
+.SH "SEE ALSO"
+.BR curl_easy_cleanup "(3), "
+.SH BUGS
+Surely there are some, you tell me!

docs/curl_easy_perform.3

@@ -0,0 +1,29 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_easy_perform 3 "26 May 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_easy_perform - Do the actual transfer in a "easy" session
+.SH SYNOPSIS
+.B #include <curl/easy.h>
+.sp
+.BI "CURLcode curl_easy_perform(CURL *" handle ");
+.ad
+.SH DESCRIPTION
+This function is called after the init and all the curl_easy_setopt() calls
+are made, and will perform the transfer as described in the options.
+It must be called with the same
+.I handle
+as input as the curl_easy_init call returned.
+.SH RETURN VALUE
+0 means everything was ok, non-zero means an error occurred as
+.I <curl/curl.h>
+defines. If the CURLOPT_ERRORBUFFER was set with
+.I curl_easy_setopt
+there willo be a readable error message in the error buffer when non-zero is
+returned.
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), " curl_easy_setopt "(3), "
+.SH BUGS
+Surely there are some, you tell me!

docs/curl_easy_setopt.3

@@ -0,0 +1,343 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_easy_setopt 3 "24 August 2000" "Curl 7.2" "libcurl Manual"
+.SH NAME
+curl_easy_setopt - Set curl easy-session options
+.SH SYNOPSIS
+.B #include <curl/easy.h>
+.sp
+.BI "CURLcode curl_easy_setopt(CURL *" handle ", CURLoption "option ", ...);
+.ad
+.SH DESCRIPTION
+curl_easy_setopt() is called to tell libcurl how to behave in a number of
+ways. Most operations in libcurl have default actions, and by using the
+appropriate options you can make them behave differently (as documented).  All
+options are set with the
+.I option
+followed by a parameter. That parameter can be a long, a function pointer or
+an object pointer, all depending on what the option in question expects. Read
+this manual carefully as bad input values may cause libcurl to behave badly!
+You can only set one option in each function call. A typical application uses
+many calls in the setup phase.
+
+The
+.I "handle"
+is the return code from the
+.I "curl_easy_init"
+call.
+.SH OPTIONS
+These options are in a bit of random order, but you'll figure it out!
+.TP 0.8i
+.B CURLOPT_FILE
+Data pointer to pass instead of FILE * to the file write function. Note that
+if you specify the
+.I CURLOPT_WRITEFUNCTION
+, this is the pointer you'll get as input.
+.TP
+.B CURLOPT_WRITEFUNCTION
+Function pointer that should use match the following prototype:
+.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+This function gets called by libcurl as soon as there is received data that
+needs to be written down. The size of the data pointed to by
+.I ptr 
+is
+.I size
+multiplied with
+.I nmemb.
+Return the number of bytes actually written or return -1 to signal error to the library (it will cause it to abort the transfer).
+.TP
+.B CURLOPT_INFILE
+Data pointer to pass instead of FILE * to the file read function. Note that if
+you specify the
+.I CURLOPT_READFUNCTION
+, this is the pointer you'll get as input.
+.TP
+.B CURLOPT_READFUNCTION
+Function pointer that should use match the following prototype:
+.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+This function gets called by libcurl as soon as it needs to read data in order
+to send it to the peer. The data area pointed at by the pointer
+.I ptr
+may be filled with at most
+.I size
+multiplied with
+.I nmemb
+number of bytes. Your function must return the actual number of bytes that you
+stored in that memory area. Returning -1 will signal an error to the library
+and cause it to abort the current transfer immediately.
+.TP
+.B CURLOPT_INFILESIZE
+When uploading a file to a remote site, this option should be used to tell
+libcurl what the expected size of the infile is.
+.TP
+.B CURLOPT_URL
+The actual URL to deal with. The parameter should be a char * to a zero
+terminated string. NOTE: this option is currently required!
+.TP
+.B CURLOPT_PROXY
+If you need libcurl to use a http proxy to access the outside world, set the
+proxy string with this option. The parameter should be a char * to a zero
+terminated string. To specify port number in this string, append":[port]" to
+the end of the host name. The proxy string may be prefixed with
+"[protocol]://" since any such prefix will be ignored.
+.TP
+.B CURLOPT_PROXYPORT
+Set this long with this option to set the proxy port to use unless it is
+specified in the proxy string CURLOPT_PROXY.
+.TP
+.B CURLOPT_VERBOSE
+Set the parameter to non-zero to get the library to display a lot of verbose
+information about its operations.
+.TP
+.B CURLOPT_HEADER
+A non-zero parameter tells the library to include the header in the
+output. This is only relevant for protocols that actually has a header
+preceeding the data (like HTTP).
+.TP
+.B CURLOPT_NOPROGRESS
+A non-zero parameter tells the library to shut of the built-in progress meter
+completely. (NOTE: future versions of the lib is likely to not have any
+built-in progress meter at all).
+.TP
+.B CURLOPT_NOBODY
+A non-zero parameter tells the library to not include the body-part in the
+output. This is only relevant for protocols that have a separate header and
+body part.
+.TP
+.B CURLOPT_FAILONERROR
+A non-zero parameter tells the library to fail silently if the HTTP code
+returned is equal or larger than 300. The default action would be to return
+the page normally, ignoring that code.
+.TP
+.B CURLOPT_UPLOAD
+A non-zero parameter tells the library to prepare for an upload. The
+CURLOPT_INFILE and CURLOPT_INFILESIZE are also interesting for uploads.
+.TP
+.B CURLOPT_POST
+A non-zero parameter tells the library to do a regular HTTP post. This is a
+normal application/x-www-form-urlencoded kind, which is the most commonly used
+one by HTML forms. See the CURLOPT_POSTFIELDS option for how to specify the
+data to post and CURLOPT_POSTFIELDSIZE in how to set the data size.
+.TP
+.B CURLOPT_FTPLISTONLY
+A non-zero parameter tells the library to just list the names of an ftp
+directory, instead of doing a full directory listin that would include file
+sizes, dates etc.
+.TP
+.B CURLOPT_FTPAPPEND
+A non-zero parameter tells the library to append to the remote file instead of
+overwrite it. This is only useful when uploading to a ftp site.
+.TP
+.B CURLOPT_NETRC
+A non-zero parameter tells the library to scan your
+.I ~/.netrc
+file to find user name and password for the remote site you are about to
+access. Do note that curl does not verify that the file has the correct
+properties set (as the standard unix ftp client does), and that only machine
+name, user name and password is taken into account (init macros and similar
+things aren't supported).
+.TP
+.B CURLOPT_FOLLOWLOCATION
+A non-zero parameter tells the library to follow any Location: header that the
+server sends as part of a HTTP header. NOTE that this means that the library
+will resend the same request on the new location and follow new Location:
+headers all the way until no more such headers are returned.
+.TP
+.B CURLOPT_TRANSFERTEXT
+A non-zero parameter tells the library to use ASCII mode for ftp transfers,
+instead of the default binary transfer. For LDAP transfers it gets the data in
+plain text instead of HTML and for win32 systems it does not set the stdout to
+binary mode. This option can be useable when transfering text data between
+system with different views on certain characters, such as newlines or
+similar.
+.TP
+.B CURLOPT_PUT
+A non-zero parameter tells the library to use HTTP PUT a file. The file to put
+must be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
+.TP
+.B CURLOPT_MUTE
+A non-zero parameter tells the library to be completely quiet.
+.TP
+.B CURLOPT_USERPWD
+Pass a char * as parameter, which should be [username]:[password] to use for
+the connection. If the password is left out, you will be prompted for it.
+.TP
+.B CURLOPT_PROXYUSERPWD
+Pass a char * as parameter, which should be [username]:[password] to use for
+the connection to the HTTP proxy. If the password is left out, you will be
+prompted for it.
+.TP
+.B CURLOPT_RANGE
+Pass a char * as parameter, which should contain the specified range you
+want. It should be in the format "X-Y", where X or Y may be left out. The HTTP
+transfers also support several intervals, separated with commas as in
+.I "X-Y,N-M".
+.TP
+.B CURLOPT_ERRORBUFFER
+Pass a char * to a buffer that the libcurl may store human readable error
+messages in. This may be more helpful than just the return code from the
+library. The buffer must be at least CURL_ERROR_SIZE big.
+.TP
+.B CURLOPT_TIMEOUT
+Pass a long as parameter containing the maximum time in seconds that you allow
+the libcurl transfer operation to take. Do note that normally, name lookups
+maky take a considerable time and that limiting the operation to less than a
+few minutes risk aborting perfectly normal operations.
+.TP
+.B CURLOPT_POSTFIELDS
+Pass a char * as parameter, which should be the full data to post in a HTTP
+post operation. See also the CURLOPT_POST.
+.TP
+.B CURLOPT_POSTFIELDSIZE
+If you want to post data to the server without letting libcurl do a strlen()
+to measure the data size, this option must be used. Also, when this option is
+used, you can post fully binary data which otherwise is likely to fail. If
+this size is set to zero, the library will use strlen() to get the data size.
+.TP
+.B CURLOPT_REFERER
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set the referer: header in the http request sent to the remote server. This
+can be used to fool servers or scripts.
+.TP
+.B CURLOPT_USERAGENT
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set the user-agent: header in the http request sent to the remote server. This
+can be used to fool servers or scripts.
+.TP
+.B CURLOPT_FTPPORT
+Pass a pointer to a zero terminated string as parameter. It will be used to
+get the IP address to use for the ftp PORT instruction. The PORT instruction
+tells the remote server to connect to our specified IP address. The string may
+be a plain IP address, a host name, an network interface name (under unix) or
+just a '-' letter to let the library use your systems default IP address.
+.TP
+.B CURLOPT_LOW_SPEED_LIMIT
+Pass a long as parameter. It contains the transfer speed in bytes per second
+that the transfer should be below during CURLOPT_LOW_SPEED_TIME seconds for
+the library to consider it too slow and abort.
+.TP
+.B CURLOPT_LOW_SPEED_TIME
+Pass a long as parameter. It contains the time in seconds that the transfer
+should be below the CURLOPT_LOW_SPEED_LIMIT for the library to consider it too
+slow and abort.
+.TP
+.B CURLOPT_RESUME_FROM
+Pass a long as parameter. It contains the offset in number of bytes that you
+want the transfer to start from.
+.TP
+.B CURLOPT_COOKIE
+Pass a pointer to a zero terminated string as parameter. It will be used to
+set a cookie in the http request. The format of the string should be
+'[NAME]=[CONTENTS];' Where NAME is the cookie name.
+.TP
+.B CURLOPT_HTTPHEADER
+Pass a pointer to a linked list of HTTP headers to pass to the server in your
+HTTP request. The linked list should be a fully valid list of 'struct
+curl_slist' structs properly filled in. Use
+.I curl_slist_append(3)
+to create the list and
+.I curl_slist_free_all(3)
+to clean up an entire list.
+.TP
+.B CURLOPT_HTTPPOST
+Tells libcurl you want a multipart/formdata HTTP POST to be made and you
+instruct what data to pass on to the server.  Pass a pointer to a linked list
+of HTTP post structs as parameter.  The linked list should be a fully valid
+list of 'struct HttpPost' structs properly filled in. The best and most
+elegant way to do this, is to use
+.I curl_formparse(3)
+as documented.
+.TP
+.B CURLOPT_SSLCERT
+Pass a pointer to a zero terminated string as parameter. The string should be
+the file name of your certficicate in PEM format.
+.TP
+.B CURLOPT_SSLCERTPASSWD
+Pass a pointer to a zero terminated string as parameter. It will be used as
+the password required to use the CURLOPT_SSLCERT certificate. If the password
+is not supplied, you will be prompted for it.
+.TP
+.B CURLOPT_CRLF
+TBD.
+.TP
+.B CURLOPT_QUOTE
+Pass a pointer to a linked list of FTP commands to pass to the server prior to
+your ftp request. The linked list should be a fully valid list of 'struct
+curl_slist' structs properly filled in. Use
+.I curl_slist_append(3)
+to append strings (commands) to the list, and clear the entire list afterwards
+with
+.I curl_slist_free_all(3)
+.TP
+.B CURLOPT_POSTQUOTE
+Pass a pointer to a linked list of FTP commands to pass to the server after
+your ftp transfer request. The linked list should be a fully valid list of
+struct curl_slist structs properly filled in as described for
+.I "CURLOPT_QUOTE"
+.TP
+.B CURLOPT_WRITEHEADER
+Pass a FILE * to be used to write the header part of the received data to.
+.TP
+.B CURLOPT_COOKIEFILE
+Pass a pointer to a zero terminated string as parameter. It should contain the
+name of your file holding cookie data. The cookie data may be in netscape
+cookie data format or just regular HTTP-style headers dumped to a file.
+.TP
+.B CURLOPT_SSLVERSION
+Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
+3. By default, the SSL library will try to solve this by itself although some
+servers make this difficult why you at times will have to use this option.
+.TP
+.B CURLOPT_TIMECONDITION
+Pass a long as parameter. This defines how the CURLOPT_TIMEVALUE time value is
+treated. You can set this parameter to TIMECOND_IFMODSINCE or
+TIMECOND_IFUNMODSINCE. This is aa HTTP-only feature. (TBD)
+.TP
+.B CURLOPT_TIMEVALUE
+Pass a long as parameter. This should be the time in seconds since 1 jan 1970,
+and the time will be used as specified in CURLOPT_TIMECONDITION or if that
+isn't used, it will be TIMECOND_IFMODSINCE by default.
+.TP
+.B CURLOPT_CUSTOMREQUEST
+Pass a pointer to a zero terminated string as parameter. It will be user
+instead of GET or HEAD when doing the HTTP request. This is useful for doing
+DELETE or other more obscure HTTP requests. Don't do this at will, make sure
+your server supports the command first.
+.TP
+.B CURLOPT_STDERR
+Pass a FILE * as parameter. This is the stream to use instead of stderr
+internally when reporting errors.
+.TP
+.B CURLOPT_WRITEINFO
+Pass a pointer to a zero terminated string as parameter. It will be used to
+report information after a successful request. This string may contain
+variables that will be substituted by their contents when output. Described
+elsewhere.
+.TP
+.B CURLOPT_PROGRESSFUNCTION
+Function pointer that should match the
+.BI curl_progress_callback
+prototype found in
+.I <curl/curl.h>
+This function gets called by libcurl instead of its internal
+equivalent. Unknown/unused argument values will be set to zero (like if you
+only download data, the upload size will remain 0). Returning a non-zero value
+from this callback will cause libcurl to abort the transfer and return
+CURLE_ABORTED_BY_CALLBACK.
+.TP
+.B CURLOPT_PROGRESSDATA
+Pass a pointer that will be untouched by libcurl and passed as the first
+argument in the progress callback set with
+.I CURLOPT_PROGRESSFUNCTION
+ .
+.PP
+.SH RETURN VALUE
+0 means the option was set properly, non-zero means an error as
+.I <curl/curl.h>
+defines
+.SH "SEE ALSO"
+.BR curl_easy_init "(3), " curl_easy_cleanup "(3), "
+.SH BUGS
+Surely there are some, you tell me!

docs/curl_formparse.3

@@ -0,0 +1,62 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_formparse 3 "6 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_formparse - add a section to a multipart/formdata HTTP POST
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode *curl_formparse(char *" string, "struct HttpPost **" firstitem,
+.BI "struct HttpPost ** "lastitem ");"
+.ad
+.SH DESCRIPTION
+curl_formparse() is used to append sections when building a multipart/formdata
+HTTP POST. Append one section at a time until you've added all the sections
+you want included and then you pass the
+.I firstitem
+pointer as parameter to CURLOPT_HTTPPOST.
+.I lastitem
+is set after each call and on repeated invokes it should be left as set to
+allow repeated invokes to find the end of the list in a faster way.
+.I string
+must be a zero terminated string following the following syntax.
+.SH "FORM PARSE STRINGS"
+The
+.I string 
+parameter must be using one of the following patterns. Note that the []
+letters should not be included in the real-life string.
+.TP 0.8i
+.B [name]=[contents]
+Add a form field named 'name' with the contents 'contents'. This is the
+typcial contents of the HTML tag <input type=text>.
+.TP
+.B [name]=@[filename]
+Add a form field named 'name' with the contents as read from the local file
+named 'filename'. This is the typcial contents of the HTML tag <input
+type=file>.
+.TP
+.B [name]=@[filename1,filename2,...]
+Add a form field named 'name' with the contents as read from the local files
+named 'filename1' and 'filename2'. This is identical to the upper, except that
+you get the contents of several files in one section.
+.TP
+.B [name]=@[filename];[content-type]
+Whenever you specify a file to read from, you can optionally specify the
+content-type as well. The content-type is passed to the server together with
+the contents of the file. curl_formparse() will guess content-type for a
+number of well-known extensions and otherwise it will set it to binary. You
+can override the internal decision by using this option.
+.TP
+.B [name]=@[filename1,filename2,...];[content-type]
+When you specify several files to read the contents from, you can set the
+content-type for all of them in the same way as with a single file.
+.PP
+.SH RETURN VALUE
+Returns non-zero if an error occurs.
+.SH "SEE ALSO"
+.BR curl_easy_setopt "(3) "
+.SH BUGS
+Surely there are some, you tell me!
+

docs/curl_getdate.3

@@ -0,0 +1,80 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_getdate 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_getdate - Convert an date in a ASCII string to number of seconds since
+January 1, 1970
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "time_t curl_getdate(char *" datestring ", time_t *"now" );
+.ad
+.SH DESCRIPTION
+This function returns the number of seconds since January 1st 1970, for the
+date and time that the
+.I datestring
+parameter specifies. The 
+.I now
+parameter is there and should hold the current time to allow the datestring to
+specify relative dates/times. Read further in the date string parser section
+below.
+.SH PARSING DATES AND TIMES
+A "date" is a string, possibly empty, containing many items separated by
+whitespace.  The whitespace may be omitted when no ambiguity arises.  The
+empty string means the beginning of today (i.e., midnight).  Order of the
+items is immaterial.  A date string may contain many flavors of items:
+.TP 0.8i
+.B calendar date items
+This can be specified in a number of different ways. Including 1970-09-17, 70-9-17, 70-09-17, 9/17/72, 24 September 1972, 24 Sept 72, 24 Sep 72, Sep 24, 1972, 24-sep-72, 24sep72.
+The year can also be omitted, for example: 9/17 or "sep 17".
+.TP
+.B time of the day items
+This string specifies the time on a given day. Syntax supported includes:
+18:19:0, 18:19, 6:19pm, 18:19-0500 (for specifying the time zone as well).
+.TP
+.B time zone items
+Specifies international time zone. There are a few acronyms supported, but in
+general you should instead use the specific realtive time compared to
+UTC. Supported formats include: -1200, MST, +0100.
+.TP
+.B day of the week items
+Specifies a day of the week. If this is mentioned alone it means that day of
+the week in the future.
+
+Days of the week may be spelled out in full: `Sunday', `Monday', etc or they
+may be abbreviated to their first three letters, optionally followed by a
+period.  The special abbreviations `Tues' for `Tuesday', `Wednes' for
+`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed.
+
+A number may precede a day of the week item to move forward supplementary
+weeks.  It is best used in expression like `third monday'.  In this context,
+`last DAY' or `next DAY' is also acceptable; they move one week before or
+after the day that DAY by itself would represent.
+.TP
+.B relative items
+A relative item adjusts a date (or the current date if none) forward or
+backward. Example syntax includes: "1 year", "1 year ago", "2 days", "4
+weeks".
+
+The string `tomorrow' is worth one day in the future (equivalent to `day'),
+the string `yesterday' is worth one day in the past (equivalent to `day ago').
+.TP
+.B pure numbers
+If the decimal number is of the form YYYYMMDD and no other calendar date item
+appears before it in the date string, then YYYY is read as the year, MM as the
+month number and DD as the day of the month, for the specified calendar date.
+.PP
+.SH RETURN VALUE
+This function returns zero when it fails to parse the date string. Otherwise
+it returns the number of seconds as described.
+.SH AUTHORS
+Originally written by Steven M. Bellovin <smb@research.att.com> while at the
+University of North Carolina at Chapel Hill.  Later tweaked by a couple of
+people on Usenet.  Completely overhauled by Rich $alz <rsalz@bbn.com> and Jim
+Berets <jberets@bbn.com> in August, 1990.
+.SH "SEE ALSO"
+.BR 
+.SH BUGS
+Surely there are some, you tell me!

docs/curl_getenv.3

@@ -0,0 +1,32 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_getenv 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_getenv - return value for environment name
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_getenv(char *" name ");
+.ad
+.SH DESCRIPTION
+curl_getenv() is a portable wrapper for the getenv() function, meant to
+emulate its behaviour and provide an identical interface for all operating
+systems libcurl builds on (including win32).
+.SH RETURN VALUE
+If successful, curl_getenv() returns a pointer to the value of the specified
+environment. The memory it refers to is malloc()ed why the application must
+free() this when the data has completed to serve its purpose. When
+.I curl_getenv()
+fails to find the specified name, it returns a null pointer.
+.SH NOTE
+Under unix operating systems, there isn't any point in returning an allocated
+memory, although other systems won't work properly if this isn't done. The
+unix implementation thus have to suffer slightly from the drawbacks of other
+systems.
+.SH "SEE ALSO"
+.BR getenv "(3C), "
+.SH BUGS
+Surely there are some, you tell me!
+

docs/curl_slist_append.3

@@ -0,0 +1,29 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_slist_append 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_slist_append - add a string to an slist
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "struct curl_slist *curl_slist_append(struct curl_slit *" list,
+.BI "char * "string ");"
+.ad
+.SH DESCRIPTION
+curl_slist_append() appends a specified string to a linked list of
+strings. The existing
+.I list
+should be passed as the first argument while the new list is returned from
+this function. The specified
+.I string
+has been appended when this function returns.
+.SH RETURN VALUE
+A null pointer is returned if anything went wrong, otherwise the new list
+pointer is returned.
+.SH "SEE ALSO"
+.BR curl_slist_free_all "(3), "
+.SH BUGS
+Surely there are some, you tell me!
+

docs/curl_slist_free_all.3

@@ -0,0 +1,22 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_slist_free_all 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_slist_free_all - free an entire curl_slist list
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_slist_free_all(struct curl_slit *" list);
+.ad
+.SH DESCRIPTION
+curl_slist_free_all() removes all traces of a previously built curl_slist
+linked list.
+.SH RETURN VALUE
+Nothing.
+.SH "SEE ALSO"
+.BR curl_slist_append "(3), "
+.SH BUGS
+Surely there are some, you tell me!
+

docs/curl_version.3

@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_version 3 "2 June 2000" "Curl 7.0" "libcurl Manual"
+.SH NAME
+curl_version - returns the libcurl version string
+.SH SYNOPSIS
+.B #include <curl/easy.h>
+.sp
+.BI "char *curl_version( );"
+.ad
+.SH DESCRIPTION
+Returns a human readable string with the version number of libcurl and some of
+its important components (like OpenSSL version).
+
+Do note that this returns the actual running lib's version, you might have
+installed a newer lib's include files in your system which may turn your
+LIBCURL_VERSION #define value to differ from this result.
+.SH RETURN VALUE
+A pointer to a zero terminated string.
+.SH "SEE ALSO"
+The
+.I LIBCURL_VERSION
+#define in <curl/curl.h>
+.SH BUGS
+Surely there are some, you tell me!

include/Makefile.am

@@ -0,0 +1,5 @@
+SUBDIRS = curl
+
+EXTRA_DIST = README
+
+AUTOMAKE_OPTIONS = foreign no-dependencies

include/curl/Makefile.am

@@ -0,0 +1,7 @@
+pkginclude_HEADERS = \
+	curl.h \
+	easy.h \
+	mprintf.h \
+	stdcheaders.h \
+	types.h
+pkgincludedir= $(includedir)/curl

include/curl/curl.h

@@ -1,5 +1,5 @@
-#ifndef __CURL_H
-#define __CURL_H
+#ifndef __CURL_CURL_H
+#define __CURL_CURL_H
 /*****************************************************************************
  *                                  _   _ ____  _     
  *  Project                     ___| | | |  _ \| |    
@@ -39,6 +39,25 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
+
+/* The include stuff here is mainly for time_t! */
+#ifdef vms
+# include <types.h>
+# include <time.h>
+#else
+# include <sys/types.h>
+# if TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  if HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+#endif /* defined (vms) */
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -46,76 +65,7 @@
 #define FALSE 0
 #endif
 
-
-#define CONF_DEFAULT 0
-#define CONF_PROXY   (1<<0) /* set if proxy is in use */
-#define CONF_PORT    (1<<1) /* set if different port than protcol-defines is
-                               used */
-#define CONF_HTTP    (1<<2) /* http get */
-#define CONF_GOPHER  (1<<3) /* gopher get */
-#define CONF_FTP     (1<<4) /* ftp get (binary mode) */
-#define CONF_VERBOSE (1<<5) /* talk a lot */
-
-#define CONF_TELNET  (1<<6)
-
-#define CONF_HEADER  (1<<8) /* throw the header out too */
-#define CONF_USERPWD (1<<9) /* user+passwd has been specified */
-#define CONF_NOPROGRESS (1<<10) /* shut off the progress meter (auto)
-                                   see also _MUTE */
-#define CONF_NOBODY  (1<<11) /* use HEAD to get http document */
-#define CONF_FAILONERROR (1<<12) /* Makes urlget() fail with a return code
-                                    WITHOUT writing anything to the output if
-                                    a return code >=300 is returned from the
-                                    server. */
-#define CONF_RANGE (1<<13) /* Byte-range request, specified parameter is set */
-#define CONF_UPLOAD (1<<14) /* this is an upload, only supported for ftp
-                               currently */
-
-#define CONF_POST (1<<15) /* HTTP POST method */
-
-/* When getting an FTP directory, this switch makes the listing only show file
-   names and nothing else. Makes machine parsing of the output possible. This
-   enforces the NLST command to the ftp server, compared to the otherwise
-   used: LIST. */
-#define CONF_FTPLISTONLY (1<<16)
-
-/* Set the referer string */
-#define CONF_REFERER (1<<17)
-#define CONF_PROXYUSERPWD (1<<18) /* Proxy user+passwd has been specified */
-
-/* For FTP, use PORT instead of PASV! */
-#define CONF_FTPPORT (1<<19)
-
-/* FTP: Append instead of overwrite on upload! */
-#define CONF_FTPAPPEND (1<<20)
-
-#define CONF_HTTPS (1<<21)  /* Use SSLeay for encrypted communication */
-
-#define CONF_NETRC (1<<22)  /* read user+password from .netrc */
-
-#define CONF_FOLLOWLOCATION (1<<23) /* get the page that the Location: tells
-				       us to get */
-
-#define CONF_FTPASCII (1<<24) /* use TYPE A for transfer */
-
-#define CONF_HTTPPOST (1<<25) /* this causes a multipart/form-data
-				 HTTP POST */
-#define CONF_NOPROT   (1<<26) /* host name specified without protocol */
-
-#define CONF_PUT      (1<<27) /* PUT the input file */
-
-#define CONF_MUTE     (1<<28) /* force NOPROGRESS */
-
-#define CONF_DICT     (1<<29) /* DICT:// protocol */
-
-#define CONF_FILE     (1<<30) /* FILE:// protocol */
-
-#define CONF_LDAP     (1<<31) /* LDAP:// protocol */
-
-struct HttpHeader {
-  struct HttpHeader *next; /* next entry in the list */
-  char *header; /* pointer to allocated line without newline */
-};
+#include <curl/types.h>
 
 struct HttpPost {
   struct HttpPost *next; /* next entry in the list */
@@ -126,94 +76,112 @@ struct HttpPost {
 			    link should link to following files */
   long flags;     /* as defined below */
 #define HTTPPOST_FILENAME (1<<0) /* specified content is a file name */
+#define HTTPPOST_READFILE (1<<1) /* specified content is a file name */
 };
 
+typedef int (*curl_progress_callback)(void *clientp,
+                                      size_t dltotal,
+                                      size_t dlnow,
+                                      size_t ultotal,
+                                      size_t ulnow);
+
+typedef size_t (*curl_write_callback)(char *buffer,
+                                      size_t size,
+                                      size_t nitems,
+                                      FILE *outstream);
+
+typedef size_t (*curl_read_callback)(char *buffer,
+                                     size_t size,
+                                     size_t nitems,
+                                     FILE *instream);
+
 /* All possible error codes from this version of urlget(). Future versions
    may return other values, stay prepared. */
 
 typedef enum {
-  URG_OK = 0,
-  URG_UNSUPPORTED_PROTOCOL,
-  URG_FAILED_INIT,
-  URG_URL_MALFORMAT,
-  URG_URL_MALFORMAT_USER,
-  URG_COULDNT_RESOLVE_PROXY,
-  URG_COULDNT_RESOLVE_HOST,
-  URG_COULDNT_CONNECT,
-  URG_FTP_WEIRD_SERVER_REPLY,
-  URG_FTP_ACCESS_DENIED,
-  URG_FTP_USER_PASSWORD_INCORRECT,
-  URG_FTP_WEIRD_PASS_REPLY,
-  URG_FTP_WEIRD_USER_REPLY,
-  URG_FTP_WEIRD_PASV_REPLY,
-  URG_FTP_WEIRD_227_FORMAT,
-  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,
-  URG_HTTP_NOT_FOUND,
-  URG_WRITE_ERROR,
+  CURLE_OK = 0,
+  CURLE_UNSUPPORTED_PROTOCOL,
+  CURLE_FAILED_INIT,
+  CURLE_URL_MALFORMAT,
+  CURLE_URL_MALFORMAT_USER,
+  CURLE_COULDNT_RESOLVE_PROXY,
+  CURLE_COULDNT_RESOLVE_HOST,
+  CURLE_COULDNT_CONNECT,
+  CURLE_FTP_WEIRD_SERVER_REPLY,
+  CURLE_FTP_ACCESS_DENIED,
+  CURLE_FTP_USER_PASSWORD_INCORRECT,
+  CURLE_FTP_WEIRD_PASS_REPLY,
+  CURLE_FTP_WEIRD_USER_REPLY,
+  CURLE_FTP_WEIRD_PASV_REPLY,
+  CURLE_FTP_WEIRD_227_FORMAT,
+  CURLE_FTP_CANT_GET_HOST,
+  CURLE_FTP_CANT_RECONNECT,
+  CURLE_FTP_COULDNT_SET_BINARY,
+  CURLE_PARTIAL_FILE,
+  CURLE_FTP_COULDNT_RETR_FILE,
+  CURLE_FTP_WRITE_ERROR,
+  CURLE_FTP_QUOTE_ERROR,
+  CURLE_HTTP_NOT_FOUND,
+  CURLE_WRITE_ERROR,
 
-  URG_MALFORMAT_USER, /* the user name is illegally specified */
-  URG_FTP_COULDNT_STOR_FILE, /* failed FTP upload */
-  URG_READ_ERROR, /* could open/read from file */
+  CURLE_MALFORMAT_USER, /* the user name is illegally specified */
+  CURLE_FTP_COULDNT_STOR_FILE, /* failed FTP upload */
+  CURLE_READ_ERROR, /* could open/read from file */
 
-  URG_OUT_OF_MEMORY,
-  URG_OPERATION_TIMEOUTED, /* the timeout time was reached */
-  URG_FTP_COULDNT_SET_ASCII, /* TYPE A failed */
+  CURLE_OUT_OF_MEMORY,
+  CURLE_OPERATION_TIMEOUTED, /* the timeout time was reached */
+  CURLE_FTP_COULDNT_SET_ASCII, /* TYPE A failed */
 
-  URG_FTP_PORT_FAILED, /* FTP PORT operation failed */
+  CURLE_FTP_PORT_FAILED, /* FTP PORT operation failed */
 
-  URG_FTP_COULDNT_USE_REST, /* the REST command failed */
-  URG_FTP_COULDNT_GET_SIZE, /* the SIZE command failed */
+  CURLE_FTP_COULDNT_USE_REST, /* the REST command failed */
+  CURLE_FTP_COULDNT_GET_SIZE, /* the SIZE command failed */
 
-  URG_HTTP_RANGE_ERROR, /* The RANGE "command" didn't seem to work */
+  CURLE_HTTP_RANGE_ERROR, /* The RANGE "command" didn't seem to work */
 
-  URG_HTTP_POST_ERROR,
+  CURLE_HTTP_POST_ERROR,
 
-  URG_SSL_CONNECT_ERROR, /* something was wrong when connecting with SSL */
+  CURLE_SSL_CONNECT_ERROR, /* something was wrong when connecting with SSL */
 
-  URG_FTP_BAD_DOWNLOAD_RESUME, /* couldn't resume download */
+  CURLE_FTP_BAD_DOWNLOAD_RESUME, /* couldn't resume download */
 
-  URG_FILE_COULDNT_READ_FILE,
+  CURLE_FILE_COULDNT_READ_FILE,
 
-  URG_LDAP_CANNOT_BIND,
-  URG_LDAP_SEARCH_FAILED,
-  URG_LIBRARY_NOT_FOUND,
-  URG_FUNCTION_NOT_FOUND,
+  CURLE_LDAP_CANNOT_BIND,
+  CURLE_LDAP_SEARCH_FAILED,
+  CURLE_LIBRARY_NOT_FOUND,
+  CURLE_FUNCTION_NOT_FOUND,
   
-  URL_LAST
-} UrgError;
+  CURLE_ABORTED_BY_CALLBACK,
+
+  CURLE_BAD_FUNCTION_ARGUMENT,
+  CURLE_BAD_CALLING_ORDER,
+
+  CURL_LAST
+} CURLcode;
 
 /* This is just to make older programs not break: */
-#define URG_FTP_PARTIAL_FILE URG_PARTIAL_FILE
+#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
 
-#define URGTAG_DONE -1
-#define URGTAG_LAST -1
-#define URGTAG_END -1
-
-#define URLGET_ERROR_SIZE 256
+#define CURL_ERROR_SIZE 256
 
 /* maximum URL length we deal with */
 #define URL_MAX_LENGTH 4096 
 #define URL_MAX_LENGTH_TXT "4095"
 
-/* name is uppercase URGTAG_<name>,
-   type is one of the defined URGTYPE_<type>
+/* name is uppercase CURLOPT_<name>,
+   type is one of the defined CURLOPTTYPE_<type>
    number is unique identifier */
-#define T(name,type,number) URGTAG_ ## name = URGTYPE_ ## type + number
+#define T(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
 
 /* long may be 32 or 64 bits, but we should never depend on anything else
    but 32 */
-#define URGTYPE_LONG          0
-#define URGTYPE_OBJECTPOINT   10000
-#define URGTYPE_FUNCTIONPOINT 20000
+#define CURLOPTTYPE_LONG          0
+#define CURLOPTTYPE_OBJECTPOINT   10000
+#define CURLOPTTYPE_FUNCTIONPOINT 20000
 
 typedef enum {
-  URGTAG_NOTHING, /* the first unused */
+  T(NOTHING, LONG, 0), /********* the first one is unused ************/
   
   /* This is the FILE * the regular output should be written to. */
   T(FILE, OBJECTPOINT, 1),
@@ -222,50 +190,51 @@ typedef enum {
   T(URL,  OBJECTPOINT, 2),
 
   /* Port number to connect to, if other than default. Specify the CONF_PORT
-     flag in the URGTAG_FLAGS to activate this */
+     flag in the CURLOPT_FLAGS to activate this */
   T(PORT, LONG, 3),
 
-  /* Name of proxy to use. Specify the CONF_PROXY flag in the URGTAG_FLAGS to
+  /* Name of proxy to use. Specify the CONF_PROXY flag in the CURLOPT_FLAGS to
      activate this */
   T(PROXY, OBJECTPOINT, 4),
   
   /* Name and password to use when fetching. Specify the CONF_USERPWD flag in
-     the URGTAG_FLAGS to activate this */
+     the CURLOPT_FLAGS to activate this */
   T(USERPWD, OBJECTPOINT, 5),
 
   /* Name and password to use with Proxy. Specify the CONF_PROXYUSERPWD 
-     flag in the URGTAG_FLAGS to activate this */
+     flag in the CURLOPT_FLAGS to activate this */
   T(PROXYUSERPWD, OBJECTPOINT, 6),
 
   /* Range to get, specified as an ASCII string. Specify the CONF_RANGE flag
-     in the URGTAG_FLAGS to activate this */
+     in the CURLOPT_FLAGS to activate this */
   T(RANGE, OBJECTPOINT, 7),
 
+#if 0
   /* Configuration flags */
   T(FLAGS, LONG, 8),
-
+#endif
   /* Specified file stream to upload from (use as input): */
   T(INFILE, OBJECTPOINT, 9),
 
-  /* Buffer to receive error messages in, must be at least URLGET_ERROR_SIZE
-     bytes big. If this is not used, error messages go to stderr instead: */
+  /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
+   * bytes big. If this is not used, error messages go to stderr instead: */
   T(ERRORBUFFER, OBJECTPOINT, 10),
 
   /* Function that will be called to store the output (instead of fwrite). The
-     parameters will use fwrite() syntax, make sure to follow them. */
+   * parameters will use fwrite() syntax, make sure to follow them. */
   T(WRITEFUNCTION, FUNCTIONPOINT, 11),
 
   /* Function that will be called to read the input (instead of fread). The
-     parameters will use fread() syntax, make sure to follow them. */
+   * parameters will use fread() syntax, make sure to follow them. */
   T(READFUNCTION, FUNCTIONPOINT, 12),
 
   /* Time-out the read operation after this amount of seconds */
   T(TIMEOUT, LONG, 13),
 
-  /* If the URGTAG_INFILE is used, this can be used to inform urlget about how
-     large the file being sent really is. That allows better error checking
-     and better verifies that the upload was succcessful. -1 means unknown
-     size. */
+  /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
+   * how large the file being sent really is. That allows better error
+   * checking and better verifies that the upload was succcessful. -1 means
+   * unknown size. */
   T(INFILESIZE, LONG, 14),
 
   /* POST input fields. */
@@ -353,10 +322,11 @@ typedef enum {
   /* HTTP request, for odd commands like DELETE, TRACE and others */
   T(STDERR, OBJECTPOINT, 37),
 
-  /* Progress mode sets alternative progress mode displays, the only
-     one defined today is 1 which makes the #-style progress bar. */
+#if 0
+  /* Progress mode set alternative progress mode displays. Alternative
+     ones should now be made by the client, not the lib! */     
   T(PROGRESSMODE, LONG, 38),
-
+#endif
   /* send linked-list of post-transfer QUOTE commands */
   T(POSTQUOTE, OBJECTPOINT, 39),
 
@@ -364,8 +334,48 @@ typedef enum {
      as described elsewhere. */
   T(WRITEINFO, OBJECTPOINT, 40),
 
-  URGTAG_LASTENTRY /* the last unusued */
-} UrgTag;
+  /* Previous FLAG bits */
+  T(VERBOSE, LONG, 41),      /* talk a lot */
+  T(HEADER, LONG, 42),       /* throw the header out too */
+  T(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
+  T(NOBODY, LONG, 44),       /* use HEAD to get http document */
+  T(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
+  T(UPLOAD, LONG, 46),       /* this is an upload */
+  T(POST, LONG, 47),         /* HTTP POST method */
+  T(FTPLISTONLY, LONG, 48),  /* Use NLST when listing ftp dir */
+
+  T(FTPAPPEND, LONG, 50),    /* Append instead of overwrite on upload! */
+  T(NETRC, LONG, 51),        /* read user+password from .netrc */
+  T(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
+
+  /* This FTPASCII name is now obsolete, to be removed, use the TRANSFERTEXT
+     instead. It goes for more protocols than just ftp... */
+  T(FTPASCII, LONG, 53),     /* use TYPE A for transfer */
+
+  T(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
+  T(PUT, LONG, 54),          /* PUT the input file */
+  T(MUTE, LONG, 55),         /* force NOPROGRESS */
+
+  /* Function that will be called instead of the internal progress display
+   * function. This function should be defined as the curl_progress_callback
+   * prototype defines. */
+  T(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
+
+  /* Data passed to the progress callback */
+  T(PROGRESSDATA, OBJECTPOINT, 57),
+
+  /* We want the referer field set automatically when following locations */
+  T(AUTOREFERER, LONG, 58),
+
+  /* Port of the proxy, can be set in the proxy string as well with:
+     "[host]:[port]" */
+  T(PROXYPORT, LONG, 59),
+
+  /* size of the POST input data, if strlen() is not good to use */
+  T(POSTFIELDSIZE, LONG, 60),
+
+  CURLOPT_LASTENTRY /* the last unusued */
+} CURLoption;
 
 #define CURL_PROGRESS_STATS 0 /* default progress display */
 #define CURL_PROGRESS_BAR   1
@@ -388,39 +398,34 @@ typedef char bool;
 #endif                     /* (rabe) */
 #endif
 
-/**********************************************************************
- *
- * >>> urlget() interface #defines changed in v5! <<<
- *
- * You enter parameters as tags. Tags are specified as a pair of parameters.
- * The first parameter in a pair is the tag identifier, telling urlget what
- * kind of tag it is, and the second is the data. The tags may come in any
- * order but MUST ALWAYS BE TERMINATED with an ending URGTAG_DONE (which
- * needs no data).
- *
- * _Very_ simple example:
- *
- * curl_urlget(URGTAG_URL, "http://www.fts.frontec.se/~dast/", URGTAG_DONE);
- *
- ***********************************************************************/
 
-UrgError curl_urlget(UrgTag, ...);
+/* These functions are in the libcurl, they're here for portable reasons and
+   they are used by the 'curl' client. They really should be moved to some kind
+   of "portability library" since it has nothing to do with file transfers and
+   might be usable to other programs...
+
+   NOTE: they return TRUE if the strings match *case insensitively*.
+ */
+extern int (strequal)(const char *s1, const char *s2);
+extern int (strnequal)(const char *s1, const char *s2, size_t n);
 
 /* external form function */
-int curl_FormParse(char *string,
+int curl_formparse(char *string,
                    struct HttpPost **httppost,
                    struct HttpPost **last_post);
 
-/* Unix and Win32 getenv function call */
-char *curl_GetEnv(char *variable);
+/* Unix and Win32 getenv function call, this returns a malloc()'ed string that
+   MUST be free()ed after usage is complete. */
+char *curl_getenv(char *variable);
 
 /* returns ascii string of the libcurl version */
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "6.5.2"
+#define LIBCURL_VERSION "7.2"
+#define LIBCURL_VERSION_NUM 0x070200
 
-/* linked-list structure for QUOTE */
+/* linked-list structure for the CURLOPT_QUOTE option */
 struct curl_slist {
 	char			*data;
 	struct curl_slist	*next;
@@ -429,4 +434,192 @@ struct curl_slist {
 struct curl_slist *curl_slist_append(struct curl_slist *list, char *data);
 void curl_slist_free_all(struct curl_slist *list);
 
-#endif /* __URLGET_H */
+/*
+ * NAME	curl_init()
+ *
+ * DESCRIPTION
+ *
+ * Inits libcurl globally. This must be used before any libcurl calls can
+ * be used. This may install global plug-ins or whatever. (This does not
+ * do winsock inits in Windows.)
+ *
+ * EXAMPLE
+ *
+ * curl_init();
+ *
+ */
+CURLcode curl_init(void);
+
+/*
+ * NAME	curl_init()
+ *
+ * DESCRIPTION
+ *
+ * Frees libcurl globally. This must be used after all libcurl calls have
+ * been used. This may remove global plug-ins or whatever. (This does not
+ * do winsock cleanups in Windows.)
+ *
+ * EXAMPLE
+ *
+ * curl_free(curl);
+ *
+ */
+void curl_free(void);
+
+/*
+ * NAME curl_open()
+ *
+ * DESCRIPTION
+ *
+ * Opens a general curl session. It does not try to connect or do anything
+ * on the network because of this call. The specified URL is only required
+ * to enable curl to figure out what protocol to "activate".
+ *
+ * A session should be looked upon as a series of requests to a single host.  A
+ * session interacts with one host only, using one single protocol.
+ *
+ * The URL is not required. If set to "" or NULL, it can still be set later
+ * using the curl_setopt() function. If the curl_connect() function is called
+ * without the URL being known, it will return error.
+ *
+ * EXAMPLE
+ *
+ * CURLcode result;
+ * CURL *curl;
+ * result = curl_open(&curl, "http://curl.haxx.nu/libcurl/");
+ * if(result != CURL_OK) {
+ *   return result;
+ * }
+ * */
+CURLcode curl_open(CURL **curl, char *url);
+
+/*
+ * NAME curl_setopt()
+ *
+ * DESCRIPTION
+ *
+ * Sets a particular option to the specified value.
+ *
+ * EXAMPLE
+ *
+ * CURL curl;
+ * curl_setopt(curl, CURL_HTTP_FOLLOW_LOCATION, TRUE);
+ */
+CURLcode curl_setopt(CURL *handle, CURLoption option, ...);
+
+/*
+ * NAME curl_close()
+ *
+ * DESCRIPTION
+ *
+ * Closes a session previously opened with curl_open()
+ *
+ * EXAMPLE
+ *
+ * CURL *curl;
+ * CURLcode result;
+ *
+ * result = curl_close(curl);
+ */
+CURLcode curl_close(CURL *curl); /* the opposite of curl_open() */
+
+CURLcode curl_read(CURLconnect *c_conn, char *buf, size_t buffersize,
+                   size_t *n);
+CURLcode curl_write(CURLconnect *c_conn, char *buf, size_t amount,
+                    size_t *n);
+
+/*
+ * NAME curl_connect()
+ *
+ * DESCRIPTION
+ *
+ * Connects to the peer server and performs the initial setup. This function
+ * writes a connect handle to its second argument that is a unique handle for
+ * this connect. This allows multiple connects from the same handle returned
+ * by curl_open().
+ *
+ * EXAMPLE
+ *
+ * CURLCode result;
+ * CURL curl;
+ * CURLconnect connect;
+ * result = curl_connect(curl, &connect);
+ */
+
+CURLcode curl_connect(CURL *curl, CURLconnect **in_connect);
+
+/*
+ * NAME curl_do()
+ *
+ * DESCRIPTION
+ *
+ * (Note: May 3rd 2000: this function does not currently allow you to
+ * specify a document, it will use the one set previously)
+ *
+ * This function asks for the particular document, file or resource that
+ * resides on the server we have connected to. You may specify a full URL,
+ * just an absolute path or even a relative path. That means, if you're just
+ * getting one file from the remote site, you can use the same URL as input
+ * for both curl_open() as well as for this function.
+ *
+ * In the even there is a host name, port number, user name or password parts
+ * in the URL, you can use the 'flags' argument to ignore them completely, or
+ * at your choice, make the function fail if you're trying to get a URL from
+ * different host than you connected to with curl_connect().
+ *
+ * You can only get one document at a time using the same connection. When one
+ * document has been received you can although request again.
+ *
+ * When the transfer is done, curl_done() MUST be called.
+ *
+ * EXAMPLE
+ *
+ * CURLCode result;
+ * char *url;
+ * CURLconnect *connect;
+ * result = curl_do(connect, url, CURL_DO_NONE); */
+CURLcode curl_do(CURLconnect *in_conn);
+
+/*
+ * NAME curl_done()
+ *
+ * DESCRIPTION
+ *
+ * When the transfer following a curl_do() call is done, this function should
+ * get called.
+ *
+ * EXAMPLE
+ *
+ * CURLCode result;
+ * char *url;
+ * CURLconnect *connect;
+ * result = curl_done(connect); */
+CURLcode curl_done(CURLconnect *connect);
+
+/*
+ * NAME curl_disconnect()
+ *
+ * DESCRIPTION
+ *
+ * Disconnects from the peer server and performs connection cleanup.
+ *
+ * EXAMPLE
+ *
+ * CURLcode result;
+ * CURLconnect *connect;
+ * result = curl_disconnect(connect); */
+CURLcode curl_disconnect(CURLconnect *connect);
+
+/*
+ * NAME curl_getdate()
+ *
+ * DESCRIPTION
+ *
+ * Returns the time, in seconds since 1 Jan 1970 of the time string given in
+ * the first argument. The time argument in the second parameter is for cases
+ * where the specified time is relative now, like 'two weeks' or 'tomorrow'
+ * etc.
+ */
+time_t curl_getdate(const char *p, const time_t *now);
+
+#endif /* __CURL_CURL_H */

include/curl/easy.h

@@ -0,0 +1,46 @@
+#ifndef __CURL_EASY_H
+#define __CURL_EASY_H
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 1998.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ *
+ * 	http://curl.haxx.nu
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+CURL *curl_easy_init(void);
+CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
+CURLcode curl_easy_perform(CURL *curl);
+void curl_easy_cleanup(CURL *curl);
+#endif

include/curl/types.h

@@ -0,0 +1,45 @@
+#ifndef __CURL_TYPES_H
+#define __CURL_TYPES_H
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 1998.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ *
+ * 	http://curl.haxx.nu
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+typedef void CURL;
+typedef void CURLconnect;
+
+#endif /* __CURL_TYPES_H */

lib/Makefile.am

@@ -4,14 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-noinst_LIBRARIES = libcurl.a
+lib_LTLIBRARIES = libcurl.la
 
 # Some flags needed when trying to cause warnings ;-)
-#CFLAGS = -g -Wall -pedantic
+# CFLAGS = -g -Wall #-pedantic
 
 INCLUDES = -I$(top_srcdir)/include
 
-libcurl_a_SOURCES = \
+libcurl_la_SOURCES = \
 arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c \
 base64.c       file.h         hostip.c       progress.c     timeval.h \
 base64.h       formdata.c     hostip.h       progress.h     \
@@ -23,7 +23,7 @@ download.c     getdate.h      ldap.c         ssluse.c       version.c \
 download.h     getenv.c       ldap.h         ssluse.h       \
 escape.c       getenv.h       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
-writeout.c writeout.h
+writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c
 
 # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
 $(srcdir)/getdate.c: getdate.y

lib/Makefile.in

@@ -63,9 +63,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AS = @AS@
 CC = @CC@
+DLLTOOL = @DLLTOOL@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 RANLIB = @RANLIB@
@@ -74,35 +79,37 @@ YACC = @YACC@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-noinst_LIBRARIES = libcurl.a
+lib_LTLIBRARIES = libcurl.la
 
 # Some flags needed when trying to cause warnings ;-)
-#CFLAGS = -g -Wall -pedantic
+# CFLAGS = -g -Wall #-pedantic
 
 INCLUDES = -I$(top_srcdir)/include
 
-libcurl_a_SOURCES =  arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c base64.c       file.h         hostip.c       progress.c     timeval.h base64.h       formdata.c     hostip.h       progress.h     cookie.c       formdata.h     http.c         sendf.c        cookie.h       ftp.c          http.h         sendf.h        url.c dict.c         ftp.h          if2ip.c        speedcheck.c   url.h dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h download.c     getdate.h      ldap.c         ssluse.c       version.c download.h     getenv.c       ldap.h         ssluse.h       escape.c       getenv.h       mprintf.c      telnet.c       escape.h       getpass.c      netrc.c        telnet.h       writeout.c writeout.h
+libcurl_la_SOURCES =  arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c base64.c       file.h         hostip.c       progress.c     timeval.h base64.h       formdata.c     hostip.h       progress.h     cookie.c       formdata.h     http.c         sendf.c        cookie.h       ftp.c          http.h         sendf.h        url.c dict.c         ftp.h          if2ip.c        speedcheck.c   url.h dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h download.c     getdate.h      ldap.c         ssluse.c       version.c download.h     getenv.c       ldap.h         ssluse.h       escape.c       getenv.h       mprintf.c      telnet.c       escape.h       getpass.c      netrc.c        telnet.h       writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h ../src/config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../src
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libcurl_a_LIBADD = 
-libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
-formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
-speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
-escape.o mprintf.o telnet.o getpass.o netrc.o writeout.o
-AR = ar
+libcurl_la_LDFLAGS = 
+libcurl_la_LIBADD = 
+libcurl_la_OBJECTS =  file.lo timeval.lo base64.lo hostip.lo progress.lo \
+formdata.lo cookie.lo http.lo sendf.lo ftp.lo url.lo dict.lo if2ip.lo \
+speedcheck.lo getdate.lo download.lo ldap.lo ssluse.lo version.lo \
+getenv.lo escape.lo mprintf.lo telnet.lo getpass.lo netrc.lo \
+writeout.lo highlevel.lo strequal.lo easy.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -110,12 +117,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(libcurl_a_SOURCES)
-OBJECTS = $(libcurl_a_OBJECTS)
+SOURCES = $(libcurl_la_SOURCES)
+OBJECTS = $(libcurl_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/Makefile
 
@@ -124,14 +131,30 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLIBRARIES:
+mostlyclean-libLTLIBRARIES:
 
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-noinstLIBRARIES:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-noinstLIBRARIES:
+maintainer-clean-libLTLIBRARIES:
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
 
 .c.o:
 	$(COMPILE) -c $<
@@ -152,10 +175,27 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-	-rm -f libcurl.a
-	$(AR) cru libcurl.a $(libcurl_a_OBJECTS) $(libcurl_a_LIBADD)
-	$(RANLIB) libcurl.a
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libcurl.la: $(libcurl_la_OBJECTS) $(libcurl_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libcurl_la_LDFLAGS) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS)
 
 tags: TAGS
 
@@ -209,7 +249,7 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 
 install-data-am:
@@ -218,13 +258,14 @@ install-data: install-data-am
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am:
+uninstall-am: uninstall-libLTLIBRARIES
 uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LTLIBRARIES)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(libdir)
 
 
 mostlyclean-generic:
@@ -236,33 +277,39 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+		distclean-libtool distclean-tags distclean-generic \
+		clean-am
+	-rm -f libtool
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \

lib/Makefile.m32

@@ -9,13 +9,13 @@
 CC = gcc
 AR = ar
 RANLIB = ranlib
-OPENSSL_PATH = ../../openssl-0.9.4
+OPENSSL_PATH = ../../openssl-0.9.5a
 
 ########################################################
 ## Nothing more to do below this line!
 
 INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2
+CFLAGS = -g -O2 -DMINGW32
 ifdef SSL
   INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
   CFLAGS += -DUSE_SSLEAY
@@ -29,14 +29,16 @@ base64.h getenv.h mprintf.c setup.h url.c download.c getpass.c \
 mprintf.h ssluse.c url.h download.h hostip.c netrc.c ssluse.h \
 urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
 if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
-ftp.c ftp.h getpass.c getpass.h version.c timeval.c  timeval.h cookie.c \
+ftp.c ftp.h getpass.h version.c timeval.c  timeval.h cookie.c \
 cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
-http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h
+http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h \
+highlevel.c strequal.c strequal.h easy.c
 
 libcurl_a_OBJECTS =  base64.o getenv.o mprintf.o url.o download.o \
 getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
-sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
-cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o
+sendf.o speedcheck.o ftp.o version.o timeval.o \
+cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o \
+highlevel.o strequal.o easy.o
 
 LIBRARIES =  $(libcurl_a_LIBRARIES)
 SOURCES = $(libcurl_a_SOURCES)
@@ -63,5 +65,6 @@ clean:
 	-@erase $(libcurl_a_OBJECTS)
 
 distrib: clean
+	
 	-@erase $(libcurl_a_LIBRARIES)
 	

lib/Makefile.vc6

@@ -23,7 +23,7 @@ LINKD = link.exe -lib
 CCRS = cl.exe /ML /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 LINKRS = link.exe -lib /LIBPATH:$(OPENSSL_PATH)/out32dll
 
-CFLAGS = /nologo /W3 /GX /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
 LFLAGS = /nologo /out:$(PROGRAM_NAME)
 LINKLIBS = kernel32.lib wsock32.lib
 LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
@@ -54,7 +54,10 @@ RELEASE_OBJS= \
 	urlr.obj \
 	filer.obj \
     writeoutr.obj \
-	versionr.obj
+	versionr.obj \
+    easyr.obj \
+    highlevelr.obj \
+    strequalr.obj
 
 DEBUG_OBJS= \
 	base64d.obj \
@@ -82,7 +85,10 @@ DEBUG_OBJS= \
 	urld.obj \
 	filed.obj \
     writeoutd.obj \
-	versiond.obj
+    versiond.obj  \
+    easyd.obj \
+    highleveld.obj \
+    strequald.obj
 
 RELEASE_SSL_OBJS= \
 	base64rs.obj \
@@ -110,7 +116,10 @@ RELEASE_SSL_OBJS= \
 	urlrs.obj \
 	filers.obj \
     writeouts.obj \
-	versionrs.obj
+	versionrs.obj \
+    easyrs.obj \
+    highlevelrs.obj \
+    strequalrs.obj
 
 LINK_OBJS= \
 	base64.obj \
@@ -138,7 +147,10 @@ LINK_OBJS= \
 	url.obj \
 	file.obj \
     writeout.obj \
-	version.obj
+	version.obj \
+    easy.obj \
+    highlevel.obj \
+    strequal.obj
 
 all : release
 
@@ -205,6 +217,12 @@ writeoutr.obj: writeout.c
         $(CCR) $(CFLAGS) writeout.c
 versionr.obj: version.c
 	$(CCR) $(CFLAGS) version.c
+easyr.obj: easy.c
+	$(CCR) $(CFLAGS) easy.c
+highlevelr.obj: highlevel.c
+	$(CCR) $(CFLAGS) highlevel.c
+strequalr.obj: strequal.c
+	$(CCR) $(CFLAGS) strequal.c
 
 ## Debug
 base64d.obj: base64.c
@@ -259,6 +277,12 @@ writeoutd.obj: writeout.c
         $(CCR) $(CFLAGS) writeout.c
 versiond.obj: version.c
 	$(CCD) $(CFLAGS) version.c
+easyd.obj: easy.c
+	$(CCR) $(CFLAGS) easy.c
+highleveld.obj: highlevel.c
+	$(CCR) $(CFLAGS) highlevel.c
+strequald.obj: strequal.c
+	$(CCR) $(CFLAGS) strequal.c
 
 
 ## Release SSL
@@ -314,6 +338,12 @@ writeoutrs.obj: writeout.c
         $(CCR) $(CFLAGS) writeout.c
 versionrs.obj: version.c
 	$(CCRS) $(CFLAGS) version.c
+easyrs.obj: easy.c
+	$(CCR) $(CFLAGS) easy.c
+highlevelrs.obj: highlevel.c
+	$(CCR) $(CFLAGS) highlevel.c
+strequalrs.obj: strequal.c
+	$(CCR) $(CFLAGS) strequal.c
 
 clean:
 	-@erase *.obj

lib/base64.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$

lib/base64.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$

lib/cookie.c

@@ -55,13 +55,15 @@ Example set of cookies:
     13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/; secure
 ****/
 
+#include "setup.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "cookie.h"
-#include "setup.h"
 #include "getdate.h"
+#include "strequal.h"
 
 /****************************************************************************
  *
@@ -131,7 +133,7 @@ struct Cookie *cookie_add(struct CookieInfo *c,
           }
           else if(strequal("expires", name)) {
             co->expirestr=strdup(what);
-            co->expires = get_date(what, &now);
+            co->expires = curl_getdate(what, &now);
           }
           else if(!co->name) {
             co->name = strdup(name);
@@ -173,9 +175,11 @@ struct Cookie *cookie_add(struct CookieInfo *c,
       return NULL;
     }
     /* strip off the possible end-of-line characters */
-    if(ptr=strchr(lineptr, '\r'))
+    ptr=strchr(lineptr, '\r');
+    if(ptr)
       *ptr=0; /* clear it */
-    if(ptr=strchr(lineptr, '\n'))
+    ptr=strchr(lineptr, '\n');
+    if(ptr)
       *ptr=0; /* clear it */
 
     firstptr=strtok(lineptr, "\t"); /* first tokenize it on the TAB */

lib/dict.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,8 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
@@ -92,12 +92,17 @@
 #include "sendf.h"
 
 #include "progress.h"
+#include "strequal.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
+CURLcode dict_done(struct connectdata *conn)
+{
+  return CURLE_OK;
+}
 
-UrgError dict(struct UrlData *data, char *path, long *bytecount)
+CURLcode dict(struct connectdata *conn)
 {
   int nth;
   char *word;
@@ -106,9 +111,13 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
   char *strategy = NULL;
   char *nthdef = NULL; /* This is not part of the protocol, but required
                           by RFC 2229 */
-  UrgError result=URG_OK;
+  CURLcode result=CURLE_OK;
+  struct UrlData *data=conn->data;
 
-  if(data->conf & CONF_USERPWD) {
+  char *path = conn->path;
+  long *bytecount = &conn->bytecount;
+
+  if(data->bits.user_passwd) {
     /* AUTH is missing */
   }
 
@@ -162,7 +171,7 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
           word
           );
     
-    result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
+    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                       -1, NULL); /* no upload */
       
     if(result)
@@ -210,7 +219,7 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
           word
           );
     
-    result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
+    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                       -1, NULL); /* no upload */
       
     if(result)
@@ -234,7 +243,7 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
             "QUIT\n",
             ppath);
       
-      result = Transfer(data, data->firstsocket, -1, FALSE, bytecount,
+      result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                         -1, NULL);
       
       if(result)
@@ -243,10 +252,5 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
     }
   }
 
-#if 0
-  ProgressEnd(data);
-#endif
-  pgrsDone(data);
-
-  return URG_OK;
+  return CURLE_OK;
 }

lib/dict.h

@@ -27,9 +27,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,6 +40,7 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError dict(struct UrlData *data, char *path, long *bytecountp);
+CURLcode dict(struct connectdata *conn);
+CURLcode dict_done(struct connectdata *conn);
 
 #endif

lib/download.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,12 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "setup.h"
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -78,19 +78,15 @@
 #include "speedcheck.h"
 #include "sendf.h"
 
-#ifdef USE_ZLIB
-#include <zlib.h>
-#endif
-
-#define MAX(x,y) ((x)>(y)?(x):(y))
+#include <curl/types.h>
 
 /* --- download and upload a stream from/to a socket --- */
 
 /* Parts of this function was brought to us by the friendly Mark Butler
    <butlerm@xmission.com>. */
 
-UrgError 
-Transfer (struct UrlData *data,
+CURLcode 
+Transfer(CURLconnect *c_conn,
          /* READ stuff */
 	  int sockfd,		/* socket to read from or -1 */
 	  int size,		/* -1 if unknown at this point */
@@ -101,485 +97,21 @@ Transfer (struct UrlData *data,
           int writesockfd,      /* socket to write to, it may very well be
                                    the same we read from. -1 disables */
           long *writebytecountp /* return number of bytes written or NULL */
-          
-
-)
+          )
 {
-  char *buf = data->buffer;
-  size_t nread;
-  int bytecount = 0; /* number of bytes read */
-  int writebytecount = 0; /* number of bytes written */
-  long contentlength=0; /* size of incoming data */
-  struct timeval start = tvnow();
-  struct timeval now = start;
-  bool header = TRUE;		/* incoming data has HTTP header */
-  int headerline = 0;		/* counts header lines to better track the
-                                   first one */
+  struct connectdata *conn = (struct connectdata *)c_conn;
+  if(!conn)
+    return CURLE_BAD_FUNCTION_ARGUMENT;
 
-  char *hbufp;			/* points at *end* of header line */
-  int hbuflen = 0;
-  char *str;			/* within buf */
-  char *str_start;		/* within buf */
-  char *end_ptr;		/* within buf */
-  char *p;			/* within headerbuff */
-  bool content_range = FALSE;	/* set TRUE if Content-Range: was found */
-  int offset = 0;		/* possible resume offset read from the
-                                   Content-Range: header */
-  int code = 0;			/* error code from the 'HTTP/1.? XXX' line */
+  /* now copy all input parameters */
+  conn->sockfd = sockfd;
+  conn->size = size;
+  conn->getheader = getheader;
+  conn->bytecountp = bytecountp;
+  conn->writesockfd = writesockfd;
+  conn->writebytecountp = writebytecountp;
 
-  /* for the low speed checks: */
-  UrgError urg;
-  time_t timeofdoc=0;
-  long bodywrites=0;
+  return CURLE_OK;
 
-  char newurl[URL_MAX_LENGTH];		/* buffer for Location: URL */
-
-  /* the highest fd we use + 1 */
-  int maxfd = (sockfd>writesockfd?sockfd:writesockfd)+1;
-
-  hbufp = data->headerbuff;
-
-  myalarm (0);			/* switch off the alarm-style timeout */
-
-  now = tvnow();
-  start = now;
-
-#define KEEP_READ  1
-#define KEEP_WRITE 2
-
-  pgrsTime(data, TIMER_PRETRANSFER);
-
-  if (!getheader) {
-    header = FALSE;
-    if(size > 0)
-      pgrsSetDownloadSize(data, size);
-  }
-  {
-    fd_set readfd;
-    fd_set writefd;
-    fd_set rkeepfd;
-    fd_set wkeepfd;
-    struct timeval interval;
-    int keepon=0;
-
-    /* timeout every X second
-       - makes a better progressmeter (i.e even when no data is read, the
-       meter can be updated and reflect reality)
-       - allows removal of the alarm() crap
-       - variable timeout is easier
-     */
-
-    FD_ZERO (&readfd);		/* clear it */
-    if(sockfd != -1) {
-      FD_SET (sockfd, &readfd); /* read socket */
-      keepon |= KEEP_READ;
-    }
-
-    FD_ZERO (&writefd);		/* clear it */
-    if(writesockfd != -1) {
-      FD_SET (writesockfd, &writefd); /* write socket */
-      keepon |= KEEP_WRITE;
-    }
-
-    /* get these in backup variables to be able to restore them on each lap in
-       the select() loop */
-    rkeepfd = readfd;
-    wkeepfd = writefd;
-
-    while (keepon) {
-      readfd = rkeepfd;		/* set those every lap in the loop */
-      writefd = wkeepfd;
-      interval.tv_sec = 1;
-      interval.tv_usec = 0;
-
-      switch (select (maxfd, &readfd, &writefd, NULL, &interval)) {
-      case -1:			/* select() error, stop reading */
-	keepon = 0; /* no more read or write */
-	continue;
-      case 0:			/* timeout */
-	break;
-      default:
-        if((keepon & KEEP_READ) && FD_ISSET(sockfd, &readfd)) {
-          /* read! */
-#ifdef USE_SSLEAY
-          if (data->use_ssl) {
-            nread = SSL_read (data->ssl, buf, BUFSIZE - 1);
-          }
-          else {
-#endif
-            nread = sread (sockfd, buf, BUFSIZE - 1);
-#ifdef USE_SSLEAY
-          }
-#endif /* USE_SSLEAY */
-
-          /* NULL terminate, allowing string ops to be used */
-          if (0 < (signed int) nread)
-            buf[nread] = 0;
-
-          /* if we receive 0 or less here, the server closed the connection and
-             we bail out from this! */
-          else if (0 >= (signed int) nread) {
-            keepon &= ~KEEP_READ;
-            break;
-          }
-
-          str = buf;		/* Default buffer to use when we write the
-                                   buffer, it may be changed in the flow below
-                                   before the actual storing is done. */
-
-          /* Since this is a two-state thing, we check if we are parsing
-             headers at the moment or not. */
-          
-          if (header) {
-            /* we are in parse-the-header-mode */
-
-            /* header line within buffer loop */
-            do {
-              int hbufp_index;
-              
-              str_start = str;	/* str_start is start of line within buf */
-              
-              end_ptr = strchr (str_start, '\n');
-              
-              if (!end_ptr) {
-                /* no more complete header lines within buffer */
-                /* copy what is remaining into headerbuff */
-                int str_length = (int)strlen(str);
-                
-                if (hbuflen + (int)str_length >= data->headersize) {
-                  char *newbuff;
-                  long newsize=MAX((hbuflen+str_length)*3/2,
-                                   data->headersize*2);
-                  hbufp_index = hbufp - data->headerbuff;
-                  newbuff = (char *)realloc(data->headerbuff, newsize);
-                  if(!newbuff) {
-                    failf (data, "Failed to alloc memory for big header!");
-                    return URG_READ_ERROR;
-                  }
-                  data->headersize=newsize;
-                  data->headerbuff = newbuff;
-                  hbufp = data->headerbuff + hbufp_index;
-                }
-                strcpy (hbufp, str);
-                hbufp += strlen (str);
-                hbuflen += strlen (str);
-                break;		/* read more and try again */
-              }
-
-              str = end_ptr + 1;	/* move just past new line */
-
-              if (hbuflen + (str - str_start) >= data->headersize) {
-                char *newbuff;
-                long newsize=MAX((hbuflen+(str-str_start))*3/2,
-                                 data->headersize*2);
-                hbufp_index = hbufp - data->headerbuff;
-                newbuff = (char *)realloc(data->headerbuff, newsize);
-                if(!newbuff) {
-                  failf (data, "Failed to alloc memory for big header!");
-                  return URG_READ_ERROR;
-                }
-                data->headersize= newsize;
-                data->headerbuff = newbuff;
-                hbufp = data->headerbuff + hbufp_index;
-              }
-
-              /* copy to end of line */
-              strncpy (hbufp, str_start, str - str_start);
-              hbufp += str - str_start;
-              hbuflen += str - str_start;
-              *hbufp = 0;
-              
-              p = data->headerbuff;
-              
-              /* we now have a full line that p points to */
-              if (('\n' == *p) || ('\r' == *p)) {
-                /* Zero-length line means end of header! */
-                if (-1 != size)	/* if known */
-                  size += bytecount;	/* we append the already read size */
-
-
-                if ('\r' == *p)
-                  p++;		/* pass the \r byte */
-                if ('\n' == *p)
-                  p++;		/* pass the \n byte */
-
-                pgrsSetDownloadSize(data, size);
-
-                header = FALSE;	/* no more header to parse! */
-
-                /* now, only output this if the header AND body are requested:
-                 */
-                if ((data->conf & (CONF_HEADER | CONF_NOBODY)) ==
-                    CONF_HEADER) {
-                  if((p - data->headerbuff) !=
-                     data->fwrite (data->headerbuff, 1,
-                                   p - data->headerbuff, data->out)) {
-                    failf (data, "Failed writing output");
-                    return URG_WRITE_ERROR;
-                  }
-                }
-                if(data->writeheader) {
-                  /* obviously, the header is requested to be written to
-                     this file: */
-                  if((p - data->headerbuff) !=
-                     data->fwrite (data->headerbuff, 1, p - data->headerbuff,
-                                   data->writeheader)) {
-                    failf (data, "Failed writing output");
-                    return URG_WRITE_ERROR;
-                  }
-                }
-                break;		/* exit header line loop */
-              }
-              
-              if (!headerline++) {
-                /* This is the first header, it MUST be the error code line
-                   or else we consiser this to be the body right away! */
-                if (sscanf (p, " HTTP/1.%*c %3d", &code)) {
-                  /* 404 -> URL not found! */
-                  if (
-                      ( ((data->conf & CONF_FOLLOWLOCATION) && (code >= 400))
-                        ||
-                        !(data->conf & CONF_FOLLOWLOCATION) && (code >= 300))
-                      && (data->conf & CONF_FAILONERROR)) {
-                    /* If we have been told to fail hard on HTTP-errors,
-                       here is the check for that: */
-                    /* serious error, go home! */
-                    failf (data, "The requested file was not found");
-                    return URG_HTTP_NOT_FOUND;
-                  }
-                  data->progress.httpcode = code;
-                }
-                else {
-                  header = FALSE;	/* this is not a header line */
-                  break;
-                }
-              }
-              /* check for Content-Length: header lines to get size */
-              if (strnequal("Content-Length", p, 14) &&
-                  sscanf (p+14, ": %ld", &contentlength))
-                size = contentlength;
-              else if (strnequal("Content-Range", p, 13) &&
-                       sscanf (p+13, ": bytes %d-", &offset)) {
-                if (data->resume_from == offset) {
-                  /* we asked for a resume and we got it */
-                  content_range = TRUE;
-                }
-              }
-              else if(data->cookies &&
-                      strnequal("Set-Cookie: ", p, 11)) {
-                cookie_add(data->cookies, TRUE, &p[12]);
-              }
-              else if(strnequal("Last-Modified:", p,
-                                strlen("Last-Modified:")) &&
-                      data->timecondition) {
-                time_t secs=time(NULL);
-                timeofdoc = get_date(p+strlen("Last-Modified:"), &secs);
-              }
-              else if ((code >= 300 && code < 400) &&
-                       (data->conf & CONF_FOLLOWLOCATION) &&
-                       strnequal("Location", p, 8) &&
-                       sscanf (p+8, ": %" URL_MAX_LENGTH_TXT "s", newurl)) {
-                /* this is the URL that the server advices us to get
-                   instead */
-                data->newurl = strdup (newurl);
-              }
-              
-              if (data->conf & CONF_HEADER) {
-                if(hbuflen != data->fwrite (p, 1, hbuflen, data->out)) {
-                  failf (data, "Failed writing output");
-                  return URG_WRITE_ERROR;
-                }
-              }
-              if(data->writeheader) {
-                /* the header is requested to be written to this file */
-                if(hbuflen != data->fwrite (p, 1, hbuflen,
-                                            data->writeheader)) {
-                  failf (data, "Failed writing output");
-                  return URG_WRITE_ERROR;
-                }
-              }
-              
-              /* reset hbufp pointer && hbuflen */
-              hbufp = data->headerbuff;
-              hbuflen = 0;
-            }
-            while (*str);		/* header line within buffer */
-
-            /* We might have reached the end of the header part here, but
-               there might be a non-header part left in the end of the read
-               buffer. */
-
-            if (!header) {
-              /* the next token and forward is not part of
-                 the header! */
-
-              /* we subtract the remaining header size from the buffer */
-              nread -= (str - buf);
-            }
-
-          }			/* end if header mode */
-
-          /* This is not an 'else if' since it may be a rest from the header
-             parsing, where the beginning of the buffer is headers and the end
-             is non-headers. */
-          if (str && !header && (nread > 0)) {
-            
-            if(0 == bodywrites) {
-              /* These checks are only made the first time we are about to
-                 write a chunk of the body */
-              if(data->conf&CONF_HTTP) {
-                /* HTTP-only checks */
-                if (data->resume_from && !content_range ) {
-                  /* we wanted to resume a download, although the server
-                     doesn't seem to support this */
-                  failf (data, "HTTP server doesn't seem to support byte ranges. Cannot resume.");
-                  return URG_HTTP_RANGE_ERROR;
-                }
-                else if (data->newurl) {
-                  /* abort after the headers if "follow Location" is set */
-                  infof (data, "Follow to new URL: %s\n", data->newurl);
-                  return URG_OK;
-                }
-                else if(data->timecondition && !data->range) {
-                  /* A time condition has been set AND no ranges have been
-                     requested. This seems to be what chapter 13.3.4 of
-                     RFC 2616 defines to be the correct action for a
-                     HTTP/1.1 client */
-                  if((timeofdoc > 0) && (data->timevalue > 0)) {
-                    switch(data->timecondition) {
-                    case TIMECOND_IFMODSINCE:
-                    default:
-                      if(timeofdoc < data->timevalue) {
-                        infof(data,
-                              "The requested document is not new enough");
-                        return URG_OK;
-                      }
-                      break;
-                    case TIMECOND_IFUNMODSINCE:
-                      if(timeofdoc > data->timevalue) {
-                        infof(data,
-                              "The requested document is not old enough");
-                        return URG_OK;
-                      }
-                      break;
-                    } /* switch */
-                  } /* two valid time strings */
-                } /* we have a time condition */
-              } /* this is HTTP */
-            } /* this is the first time we write a body part */
-            bodywrites++;
-
-            if(data->maxdownload &&
-               (bytecount + nread > data->maxdownload)) {
-              nread = data->maxdownload - bytecount;
-              if(nread < 0 ) /* this should be unusual */
-                nread = 0;
-              keepon &= ~KEEP_READ; /* we're done reading */
-            }
-
-            bytecount += nread;
-
-            pgrsSetDownloadCounter(data, (double)bytecount);
-            
-            if (nread != data->fwrite (str, 1, nread, data->out)) {
-              failf (data, "Failed writing output");
-              return URG_WRITE_ERROR;
-            }
-
-          } /* if (! header and data to read ) */
-        } /* if( read from socket ) */
-
-        if((keepon & KEEP_WRITE) && FD_ISSET(writesockfd, &writefd)) {
-          /* write */
-
-          char scratch[BUFSIZE * 2];
-          int i, si;
-          int bytes_written;
-
-          if(data->crlf)
-            buf = data->buffer; /* put it back on the buffer */
-
-          nread = data->fread(buf, 1, BUFSIZE, data->in);
-          writebytecount += nread;
-
-          pgrsSetUploadCounter(data, (double)writebytecount);
-            
-          if (nread<=0) {
-            /* done */
-            keepon &= ~KEEP_WRITE; /* we're done writing */
-            break;
-          }
-
-          /* convert LF to CRLF if so asked */
-          if (data->crlf) {
-            for(i = 0, si = 0; i < (int)nread; i++, si++) {
-              if (buf[i] == 0x0a) {
-                scratch[si++] = 0x0d;
-                scratch[si] = 0x0a;
-              }
-              else {
-                scratch[si] = buf[i];
-              }
-            }
-            nread = si;
-            buf = scratch; /* point to the new buffer */
-          }
-
-          /* write to socket */
-#ifdef USE_SSLEAY
-          if (data->use_ssl) {
-            bytes_written = SSL_write(data->ssl, buf, nread);
-          }
-          else {
-#endif
-            bytes_written = swrite(writesockfd, buf, nread);
-#ifdef USE_SSLEAY
-          }
-#endif /* USE_SSLEAY */
-          if(nread != bytes_written) {
-            failf(data, "Failed uploading data");
-            return URG_WRITE_ERROR;
-          }
-
-        }
-
-        break;
-      }
-
-      now = tvnow();
-      pgrsUpdate(data);
-
-      urg = speedcheck (data, now);
-      if (urg)
-	return urg;
-
-      if (data->timeout && (tvdiff (now, start) > data->timeout)) {
-	failf (data, "Operation timed out with %d out of %d bytes received",
-	       bytecount, size);
-	return URG_OPERATION_TIMEOUTED;
-      }
-#ifdef MULTIDOC
-      if(contentlength && bytecount >= contentlength) {
-        /* we're done with this download, now stop it */
-        break;
-      }
-#endif
-    }
-  }
-  if(!(data->conf&CONF_NOBODY) && contentlength &&
-     (bytecount != contentlength)) {
-    failf(data, "transfer closed with %d bytes remaining to read",
-          contentlength-bytecount);
-    return URG_PARTIAL_FILE;
-  }
-  pgrsUpdate(data);
-
-  if(bytecountp)
-    *bytecountp = bytecount; /* read count */
-  if(writebytecountp)
-    *writebytecountp = writebytecount; /* write count */
-
-  return URG_OK;
 }
           
-

lib/download.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -39,8 +39,8 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError 
-Transfer (struct UrlData *data,
+CURLcode 
+Transfer (struct connectdata *data,
 	  int sockfd,		/* socket to read from or -1 */
 	  int size,		/* -1 if unknown at this point */
 	  bool getheader,	/* TRUE if header parsing is wanted */

lib/easy.c

@@ -0,0 +1,161 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 1998.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <daniel@haxx.se>
+ *
+ * 	http://curl.haxx.se
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+
+#include "setup.h"
+
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#include "strequal.h"
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#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>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include "highlevel.h"
+#include <curl/types.h>
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+CURL *curl_easy_init(void)
+{
+  CURLcode res;
+  struct UrlData *data;
+
+  if(curl_init())
+    return NULL;
+
+  /* We use curl_open() with undefined URL so far */
+  res = curl_open((CURL **)&data, NULL);
+  if(res != CURLE_OK)
+    return NULL;
+
+  data->interf = CURLI_EASY; /* mark it as an easy one */
+  return data;
+}
+
+typedef int (*func_T)(void);
+CURLcode curl_easy_setopt(CURL *curl, CURLoption tag, ...)
+{
+  va_list arg;
+  func_T param_func = (func_T)0;
+  long param_long = 0;
+  void *param_obj = NULL;
+  struct UrlData *data = curl;
+
+  va_start(arg, tag);
+
+  /* PORTING NOTE:
+     Object pointers can't necessarily be casted to function pointers and
+     therefore we need to know what type it is and read the correct type
+     at once. This should also correct problems with different sizes of
+     the types.
+  */
+
+  if(tag < CURLOPTTYPE_OBJECTPOINT) {
+    /* This is a LONG type */
+    param_long = va_arg(arg, long);
+    curl_setopt(data, tag, param_long);
+  }
+  else if(tag < CURLOPTTYPE_FUNCTIONPOINT) {
+    /* This is a object pointer type */
+    param_obj = va_arg(arg, void *);
+    curl_setopt(data, tag, param_obj);
+  }
+  else {
+    param_func = va_arg(arg, func_T );
+    curl_setopt(data, tag, param_func);
+  }
+
+  va_end(arg);
+  return CURLE_OK;
+}
+
+CURLcode curl_easy_perform(CURL *curl)
+{
+  return curl_transfer(curl);
+}
+
+void curl_easy_cleanup(CURL *curl)
+{
+  curl_close(curl);
+  curl_free();
+}

lib/escape.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -81,16 +81,15 @@ char *curl_escape(char *string)
    return ns;
 }
 
-char *curl_unescape(char *string)
+char *curl_unescape(char *string, int length)
 {
-   int alloc = strlen(string)+1;
+   int alloc = (length?length:strlen(string))+1;
    char *ns = malloc(alloc);
    unsigned char in;
    int index=0;
    int hex;
   
-
-   while(*string) {
+   while(--alloc) {
       in = *string;
       if('+' == in)
 	 in = ' ';

lib/escape.h

@@ -27,9 +27,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -44,6 +44,6 @@
  * allocated string or NULL if an error occurred.  */
 
 char *curl_escape(char *string);
-char *curl_unescape(char *string);
+char *curl_unescape(char *string, int length);
 
 #endif

lib/file.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,8 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
@@ -60,13 +60,17 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <sys/time.h>
 #include <sys/resource.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -100,23 +104,25 @@
 #include <curl/mprintf.h>
 
 
-UrgError file(struct UrlData *data, char *path, long *bytecountp)
+CURLcode file(struct connectdata *conn)
 {
   /* This implementation ignores the host name in conformance with 
      RFC 1738. Only local files (reachable via the standard file system)
      are supported. This means that files on remotely mounted directories
      (via NFS, Samba, NT sharing) can be accessed through a file:// URL
   */
-
+  CURLcode res = CURLE_OK;
+  char *path = conn->path;
   struct stat statbuf;
   size_t expected_size=-1;
   size_t nread;
+  struct UrlData *data = conn->data;
   char *buf = data->buffer;
   int bytecount = 0;
   struct timeval start = tvnow();
   struct timeval now = start;
   int fd;
-  char *actual_path = curl_unescape(path);
+  char *actual_path = curl_unescape(path, 0);
 
 #if defined(WIN32) || defined(__EMX__)
   int i;
@@ -134,7 +140,7 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
 
   if(fd == -1) {
     failf(data, "Couldn't open file %s", path);
-    return URG_FILE_COULDNT_READ_FILE;
+    return CURLE_FILE_COULDNT_READ_FILE;
   }
   if( -1 != fstat(fd, &statbuf)) {
     /* we could stat it, then read out the size */
@@ -151,7 +157,7 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
   if(expected_size != -1)
     pgrsSetDownloadSize(data, expected_size);
 
-  while (1) {
+  while (res == CURLE_OK) {
     nread = read(fd, buf, BUFSIZE-1);
 
     if (0 <= nread)
@@ -166,21 +172,19 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
        file descriptor). */
     if(nread != data->fwrite (buf, 1, nread, data->out)) {
       failf (data, "Failed writing output");
-      return URG_WRITE_ERROR;
+      return CURLE_WRITE_ERROR;
     }
     now = tvnow();
-    pgrsUpdate(data);
-#if 0
-    ProgressShow (data, bytecount, start, now, FALSE);
-#endif
+    if(pgrsUpdate(data))
+      res = CURLE_ABORTED_BY_CALLBACK;
   }
   now = tvnow();
-#if 0
-  ProgressShow (data, bytecount, start, now, TRUE);
-#endif
-  pgrsUpdate(data);
+  if(pgrsUpdate(data))
+    res = CURLE_ABORTED_BY_CALLBACK;
 
   close(fd);
 
-  return URG_OK;
+  free(actual_path);
+
+  return res;
 }

lib/file.h

@@ -27,9 +27,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,6 +40,6 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError file(struct UrlData *data, char *path, long *bytecountp);
+CURLcode file(struct connectdata *conn);
 
 #endif

lib/formdata.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -49,6 +49,8 @@
 
  */
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,10 +58,11 @@
 
 #include <time.h>
 
-#include "setup.h"
 #include <curl/curl.h>
 #include "formdata.h"
 
+#include "strequal.h"
+
 /* Length of the random boundary string. The risk of this being used
    in binary data is very close to zero, 64^32 makes
    6277101735386680763835789423207666416102355444464034512896
@@ -100,7 +103,7 @@ static void GetStr(char **string,
  *
  ***************************************************************************/
 
-int curl_FormParse(char *input,
+int curl_formparse(char *input,
                    struct HttpPost **httppost,
                    struct HttpPost **last_post)
 {
@@ -117,7 +120,7 @@ int FormParse(char *input,
   /* nextarg MUST be a string in the format 'name=contents' and we'll
      build a linked list with the info */
   char name[256];
-  char contents[1024]="";
+  char contents[4096]="";
   char major[128];
   char minor[128];
   long flags = 0;
@@ -130,7 +133,7 @@ int FormParse(char *input,
   struct HttpPost *subpost; /* a sub-node */
   unsigned int i;
 
-  if(1 <= sscanf(input, "%255[^ =] = %1023[^\n]", name, contents)) {
+  if(1 <= sscanf(input, "%255[^ =] = %4095[^\n]", name, contents)) {
     /* the input was using the correct format */
     contp = contents;
 
@@ -279,8 +282,14 @@ int FormParse(char *input,
       if(post) {
 	memset(post, 0, sizeof(struct HttpPost));
 	GetStr(&post->name, name);      /* get the name */
+	if( contp[0]=='<' ) {
+	  GetStr(&post->contents, contp+1); /* get the contents */
+	  post->flags = HTTPPOST_READFILE;
+	}
+	else {
 	  GetStr(&post->contents, contp); /* get the contents */
 	  post->flags = 0;
+	}
 
 	/* make the previous point to this */
 	if(*last_post)
@@ -316,6 +325,7 @@ static int AddFormData(struct FormData **formp,
   newform->line = (char *)malloc(length+1);
   memcpy(newform->line, line, length+1);
   newform->length = length;
+  newform->line[length]=0; /* zero terminate for easier debugging */
   
   if(*formp) {
     (*formp)->next = newform;
@@ -331,7 +341,7 @@ static int AddFormData(struct FormData **formp,
 static int AddFormDataf(struct FormData **formp,
 			 char *fmt, ...)
 {
-  char s[1024];
+  char s[4096];
   va_list ap;
   va_start(ap, fmt);
   vsprintf(s, fmt, ap);
@@ -377,7 +387,7 @@ void FormFree(struct FormData *form)
     free(form->line); /* free the line */
     free(form);       /* free the struct */
 
-  } while(form=next); /* continue */
+  } while((form=next)); /* continue */
 }
 
 struct FormData *getFormData(struct HttpPost *post,
@@ -451,15 +461,14 @@ struct FormData *getFormData(struct HttpPost *post,
       if(file->contenttype &&
 	 !strnequal("text/", file->contenttype, 5)) {
 	/* this is not a text content, mention our binary encoding */
-	size += AddFormDataf(&form,
-			     "\r\nContent-Transfer-Encoding: binary");
+	size += AddFormData(&form, "\r\nContent-Transfer-Encoding: binary", 0);
       }
 
 
-      size += AddFormDataf(&form,
-			   "\r\n\r\n");
+      size += AddFormData(&form, "\r\n\r\n", 0);
 
-      if(post->flags & HTTPPOST_FILENAME) {
+      if((post->flags & HTTPPOST_FILENAME) ||
+	 (post->flags & HTTPPOST_READFILE)) {
 	/* we should include the contents from the specified file */
 	FILE *fileread;
 	char buffer[1024];
@@ -476,15 +485,12 @@ struct FormData *getFormData(struct HttpPost *post,
 	  }
           if(fileread != stdin)
             fclose(fileread);
+	} else {
+	  size += AddFormData(&form, "[File wasn't found by client]", 0);
 	}
-	else {
-	  size += AddFormDataf(&form, "[File wasn't found by client]");
-	}
-      }
-      else {
+      } else {
 	/* include the contents we got */
-	size += AddFormDataf(&form,
-			     post->contents);
+	size += AddFormData(&form, post->contents, 0);
       }
     } while((file = file->more)); /* for each specified file for this field */
 
@@ -513,12 +519,25 @@ struct FormData *getFormData(struct HttpPost *post,
 
 int FormInit(struct Form *form, struct FormData *formdata )
 {
-  form->data = formdata;
-  form->sent = 0;
-
   if(!formdata)
     return 1; /* error */
 
+#if 0  
+  struct FormData *lastnode=formdata;
+
+  /* find the last node in the list */
+  while(lastnode->next) {
+    lastnode = lastnode->next;
+  }
+
+  /* Now, make sure that we'll send a nice terminating sequence at the end
+   * of the post. We *DONT* add this string to the size of the data since this
+   * is actually AFTER the data. */
+  AddFormDataf(&lastnode, "\r\n\r\n");
+#endif
+  form->data = formdata;
+  form->sent = 0;
+
   return 0;
 }
 
@@ -537,7 +556,7 @@ int FormReader(char *buffer,
   wantedsize = size * nitems;
 
   if(!form->data)
-    return 0; /* nothing, error, empty */
+    return -1; /* nothing, error, empty */
 
   do {
   

lib/formdata.h

@@ -31,17 +31,17 @@
  *   Linas Vepstas <linas@linas.org>
  *   Bjorn Reese <breese@imada.ou.dk>
  *   Johan Anderson <johan@homemail.com>
- *   Kjell Ericson <Kjell.Ericson@haxx.nu>
+ *   Kjell Ericson <Kjell.Ericson@haxx.se>
  *   Troy Engel <tengel@palladium.net>
  *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
+ *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
  *   Angus Mackay <amackay@gus.ml.org>
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -52,7 +52,10 @@
  *
  * ------------------------------------------------------------
  * $Log$
- * Revision 1.2  2000-01-10 23:36:14  bagder
+ * Revision 1.3  2000-06-20 15:31:26  bagder
+ * haxx.nu => haxx.se
+ *
+ * Revision 1.2  2000/01/10 23:36:14  bagder
  * syncing with local edit
  *
  * Revision 1.4  1999/09/06 06:59:40  dast

lib/ftp.h

@@ -27,9 +27,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,11 +40,9 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError ftp(struct UrlData *data,
-             long *bytecountp,
-             char *ftpuser,
-             char *ftppasswd,
-             char *ppath);
+CURLcode ftp(struct connectdata *conn);
+CURLcode ftp_done(struct connectdata *conn);
+CURLcode ftp_connect(struct connectdata *conn);
 
 struct curl_slist *curl_slist_append(struct curl_slist *list, char *data);
 void curl_slist_free_all(struct curl_slist *list);

lib/getdate.c

@@ -1,25 +1,25 @@
 
-/*  A Bison parser, made from getdate.y with Bison version GNU Bison version 1.21
-  */
+/*  A Bison parser, made from getdate.y
+    by GNU Bison version 1.28  */
 
 #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"
 
@@ -33,10 +33,20 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
+
+# ifdef NEED_REENTRANT
+# define _REENTRANT /* Necessary to use in Solaris, since the silly guys at
+                       Sun made the localtime_r() prototype dependent on it
+                       (or _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS) */
+# endif
+
+# ifdef HAVE_TIME_H
+#  include <time.h>
+# endif
 #endif
 
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -212,28 +222,11 @@ static int	yyRelSeconds;
 static int	yyRelYear;
 
 
-#line 195 "getdate.y"
+#line 205 "getdate.y"
 typedef union {
     int			Number;
     enum _MERIDIAN	Meridian;
 } YYSTYPE;
-
-#ifndef YYLTYPE
-typedef
-  struct yyltype
-    {
-      int timestamp;
-      int first_line;
-      int first_column;
-      int last_line;
-      int last_column;
-      char *text;
-   }
-  yyltype;
-
-#define YYLTYPE yyltype
-#endif
-
 #include <stdio.h>
 
 #ifndef __cplusplus
@@ -248,7 +241,7 @@ typedef
 #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,
@@ -276,9 +269,9 @@ static const char yytranslate[] = {     0,
      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
@@ -312,18 +305,22 @@ static const short yyrhs[] = {    -1,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   211,   212,   215,   218,   221,   224,   227,   230,   233,   239,
-   245,   254,   260,   272,   275,   278,   284,   288,   292,   298,
-   302,   320,   326,   332,   336,   341,   345,   352,   360,   363,
-   366,   369,   372,   375,   378,   381,   384,   387,   390,   393,
-   396,   399,   402,   405,   408,   411,   414,   419,   452,   456
+   221,   222,   225,   228,   231,   234,   237,   240,   243,   249,
+   255,   264,   270,   282,   285,   288,   294,   298,   302,   308,
+   312,   330,   336,   342,   346,   351,   355,   362,   370,   373,
+   376,   379,   382,   385,   388,   391,   394,   397,   400,   403,
+   406,   409,   412,   415,   418,   421,   424,   429,   462,   466
 };
+#endif
 
-static const char * const yytname[] = {   "$","error","$illegal.","tAGO","tDAY",
+
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+
+static const char * const yytname[] = {   "$","error","$undefined.","tAGO","tDAY",
 "tDAY_UNIT","tDAYZONE","tDST","tHOUR_UNIT","tID","tMERIDIAN","tMINUTE_UNIT",
 "tMONTH","tMONTH_UNIT","tSEC_UNIT","tSNUMBER","tUNUMBER","tYEAR_UNIT","tZONE",
 "':'","','","'/'","spec","item","time","zone","day","date","rel","relunit","number",
-"o_merid",""
+"o_merid", NULL
 };
 #endif
 
@@ -393,14 +390,15 @@ static const short yycheck[] = {     0,
     56
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/gnu/lib/bison.simple"
+#line 3 "/opt/TWWfsw/bison/share/bison.simple"
+/* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -410,43 +408,67 @@ static const short yycheck[] = {     0,
 
    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.  */
 
-
-#ifndef alloca
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
-#include <alloca.h>
-#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
-#include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-#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 (unsigned int);
-#endif /* not __cplusplus */
-#endif /* __hpux */
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc.  */
-#endif /* not GNU C.  */
-#endif /* alloca not defined.  */
+/* 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.  */
 
 /* 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) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* 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)
+/* 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
+#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 /* YYSTACK_USE_ALLOCA not defined */
+
+#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
    as one case of the switch.  */
@@ -455,8 +477,8 @@ void *alloca (unsigned int);
 #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
@@ -485,10 +507,18 @@ while (0)
 
 #ifdef YYPURE
 #ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
 #define YYLEX		yylex(&yylval, &yylloc)
+#endif
+#else /* not YYLSP_NEEDED */
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, YYLEX_PARAM)
 #else
 #define YYLEX		yylex(&yylval)
 #endif
+#endif /* not YYLSP_NEEDED */
 #endif
 
 /* If nonreentrant, generate the variables here */
@@ -529,24 +559,24 @@ int yydebug;			/*  nonzero means print parse trace	*/
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
 
+/* 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_bcopy(FROM,TO,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
 #else				/* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
-__yy_bcopy (from, to, count)
-     char *from;
+__yy_memcpy (to, from, count)
      char *to;
-     int count;
+     char *from;
+     unsigned int count;
 {
   register char *f = from;
   register char *t = to;
@@ -561,10 +591,10 @@ __yy_bcopy (from, to, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
-__yy_bcopy (char *from, char *to, 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)
@@ -574,16 +604,46 @@ __yy_bcopy (char *from, char *to, int count)
 #endif
 #endif
 
-#line 184 "/usr/gnu/lib/bison.simple"
+#line 217 "/opt/TWWfsw/bison/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 *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
+
+#ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#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(YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
 {
   register int yystate;
   register int yyn;
   register short *yyssp;
   register YYSTYPE *yyvsp;
   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1;		/*  lookahead token as an internal (translated) token number */
+  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
 
   short	yyssa[YYINITDEPTH];	/*  the state stack			*/
   YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
@@ -602,6 +662,7 @@ yyparse()
 #endif
 
   int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
 
 #ifdef YYPURE
   int yychar;
@@ -662,13 +723,20 @@ yynewstate:
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
 	 the data in use in that stack, in bytes.  */
+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+	 but that might be undefined if yyoverflow is a macro.  */
       yyoverflow("parser stack overflow",
 		 &yyss1, size * sizeof (*yyssp),
 		 &yyvs1, size * sizeof (*yyvsp),
-#ifdef YYLSP_NEEDED
 		 &yyls1, size * sizeof (*yylsp),
-#endif
 		 &yystacksize);
+#else
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yystacksize);
+#endif
 
       yyss = yyss1; yyvs = yyvs1;
 #ifdef YYLSP_NEEDED
@@ -679,18 +747,32 @@ yynewstate:
       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_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-      __yy_bcopy ((char *)yyvs1, (char *)yyvs, 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_bcopy ((char *)yyls1, (char *)yyls, 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 */
 
@@ -829,6 +911,7 @@ yydefault:
 /* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
   yylen = yyr2[yyn];
+  if (yylen > 0)
     yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
 #if YYDEBUG != 0
@@ -850,37 +933,37 @@ yyreduce:
   switch (yyn) {
 
 case 3:
-#line 215 "getdate.y"
+#line 225 "getdate.y"
 {
 	    yyHaveTime++;
 	;
     break;}
 case 4:
-#line 218 "getdate.y"
+#line 228 "getdate.y"
 {
 	    yyHaveZone++;
 	;
     break;}
 case 5:
-#line 221 "getdate.y"
+#line 231 "getdate.y"
 {
 	    yyHaveDate++;
 	;
     break;}
 case 6:
-#line 224 "getdate.y"
+#line 234 "getdate.y"
 {
 	    yyHaveDay++;
 	;
     break;}
 case 7:
-#line 227 "getdate.y"
+#line 237 "getdate.y"
 {
 	    yyHaveRel++;
 	;
     break;}
 case 9:
-#line 233 "getdate.y"
+#line 243 "getdate.y"
 {
 	    yyHour = yyvsp[-1].Number;
 	    yyMinutes = 0;
@@ -889,7 +972,7 @@ case 9:
 	;
     break;}
 case 10:
-#line 239 "getdate.y"
+#line 249 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -898,7 +981,7 @@ case 10:
 	;
     break;}
 case 11:
-#line 245 "getdate.y"
+#line 255 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -910,7 +993,7 @@ case 11:
 	;
     break;}
 case 12:
-#line 254 "getdate.y"
+#line 264 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -919,7 +1002,7 @@ case 12:
 	;
     break;}
 case 13:
-#line 260 "getdate.y"
+#line 270 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -932,53 +1015,53 @@ case 13:
 	;
     break;}
 case 14:
-#line 272 "getdate.y"
+#line 282 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number;
 	;
     break;}
 case 15:
-#line 275 "getdate.y"
+#line 285 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number - 60;
 	;
     break;}
 case 16:
-#line 279 "getdate.y"
+#line 289 "getdate.y"
 {
 	    yyTimezone = yyvsp[-1].Number - 60;
 	;
     break;}
 case 17:
-#line 284 "getdate.y"
+#line 294 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[0].Number;
 	;
     break;}
 case 18:
-#line 288 "getdate.y"
+#line 298 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[-1].Number;
 	;
     break;}
 case 19:
-#line 292 "getdate.y"
+#line 302 "getdate.y"
 {
 	    yyDayOrdinal = yyvsp[-1].Number;
 	    yyDayNumber = yyvsp[0].Number;
 	;
     break;}
 case 20:
-#line 298 "getdate.y"
+#line 308 "getdate.y"
 {
 	    yyMonth = yyvsp[-2].Number;
 	    yyDay = yyvsp[0].Number;
 	;
     break;}
 case 21:
-#line 302 "getdate.y"
+#line 312 "getdate.y"
 {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
 	     The goal in recognizing YYYY/MM/DD is solely to support legacy
@@ -999,7 +1082,7 @@ case 21:
 	;
     break;}
 case 22:
-#line 320 "getdate.y"
+#line 330 "getdate.y"
 {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
 	    yyYear = yyvsp[-2].Number;
@@ -1008,7 +1091,7 @@ case 22:
 	;
     break;}
 case 23:
-#line 326 "getdate.y"
+#line 336 "getdate.y"
 {
 	    /* e.g. 17-JUN-1992.  */
 	    yyDay = yyvsp[-2].Number;
@@ -1017,14 +1100,14 @@ case 23:
 	;
     break;}
 case 24:
-#line 332 "getdate.y"
+#line 342 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[0].Number;
 	;
     break;}
 case 25:
-#line 336 "getdate.y"
+#line 346 "getdate.y"
 {
 	    yyMonth = yyvsp[-3].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1032,14 +1115,14 @@ case 25:
 	;
     break;}
 case 26:
-#line 341 "getdate.y"
+#line 351 "getdate.y"
 {
 	    yyMonth = yyvsp[0].Number;
 	    yyDay = yyvsp[-1].Number;
 	;
     break;}
 case 27:
-#line 345 "getdate.y"
+#line 355 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1047,7 +1130,7 @@ case 27:
 	;
     break;}
 case 28:
-#line 352 "getdate.y"
+#line 362 "getdate.y"
 {
 	    yyRelSeconds = -yyRelSeconds;
 	    yyRelMinutes = -yyRelMinutes;
@@ -1058,115 +1141,115 @@ case 28:
 	;
     break;}
 case 30:
-#line 363 "getdate.y"
+#line 373 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 31:
-#line 366 "getdate.y"
+#line 376 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 32:
-#line 369 "getdate.y"
+#line 379 "getdate.y"
 {
 	    yyRelYear += yyvsp[0].Number;
 	;
     break;}
 case 33:
-#line 372 "getdate.y"
+#line 382 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 34:
-#line 375 "getdate.y"
+#line 385 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 35:
-#line 378 "getdate.y"
+#line 388 "getdate.y"
 {
 	    yyRelMonth += yyvsp[0].Number;
 	;
     break;}
 case 36:
-#line 381 "getdate.y"
+#line 391 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 37:
-#line 384 "getdate.y"
+#line 394 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 38:
-#line 387 "getdate.y"
+#line 397 "getdate.y"
 {
 	    yyRelDay += yyvsp[0].Number;
 	;
     break;}
 case 39:
-#line 390 "getdate.y"
+#line 400 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 40:
-#line 393 "getdate.y"
+#line 403 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 41:
-#line 396 "getdate.y"
+#line 406 "getdate.y"
 {
 	    yyRelHour += yyvsp[0].Number;
 	;
     break;}
 case 42:
-#line 399 "getdate.y"
+#line 409 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 43:
-#line 402 "getdate.y"
+#line 412 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 44:
-#line 405 "getdate.y"
+#line 415 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[0].Number;
 	;
     break;}
 case 45:
-#line 408 "getdate.y"
+#line 418 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 46:
-#line 411 "getdate.y"
+#line 421 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 47:
-#line 414 "getdate.y"
+#line 424 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[0].Number;
 	;
     break;}
 case 48:
-#line 420 "getdate.y"
+#line 430 "getdate.y"
 {
 	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
 	      yyYear = yyvsp[0].Number;
@@ -1199,20 +1282,20 @@ case 48:
 	  ;
     break;}
 case 49:
-#line 453 "getdate.y"
+#line 463 "getdate.y"
 {
 	    yyval.Meridian = MER24;
 	  ;
     break;}
 case 50:
-#line 457 "getdate.y"
+#line 467 "getdate.y"
 {
 	    yyval.Meridian = yyvsp[0].Meridian;
 	  ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 457 "/usr/gnu/lib/bison.simple"
+#line 543 "/opt/TWWfsw/bison/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1407,8 +1490,32 @@ yyerrhandle:
 
   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 462 "getdate.y"
+#line 472 "getdate.y"
 
 
 /* Include this file down here because bison inserts code above which
@@ -1864,14 +1971,20 @@ difftm (struct tm *a, struct tm *b)
 }
 
 time_t
-get_date (const char *p, const time_t *now)
+curl_getdate (const char *p, const time_t *now)
 {
   struct tm tm, tm0, *tmp;
   time_t Start;
-
+#ifdef HAVE_LOCALTIME_R
+  struct tm keeptime;
+#endif
   yyInput = p;
   Start = now ? *now : time ((time_t *) NULL);
+#ifdef HAVE_LOCALTIME_R
+  tmp = localtime_r(&Start, &keeptime);
+#else
   tmp = localtime (&Start);
+#endif
   if (!tmp)
     return -1;
   yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
@@ -1998,7 +2111,7 @@ main (ac, av)
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
     {
-      d = get_date (buff, (time_t *) NULL);
+      d = curl_getdate (buff, (time_t *) NULL);
       if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
       else

lib/getdate.h

@@ -1,18 +1,11 @@
-/*  Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/*
+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
+**
+**  This code is in the public domain and has no copyright.
+*/
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -43,4 +36,4 @@
 # endif
 #endif /* defined (vms) */
 
-time_t get_date PARAMS ((const char *p, const time_t *now));
+time_t curl_getdate PARAMS ((const char *p, const time_t *now));

lib/getdate.y

@@ -9,10 +9,20 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
+
+# ifdef NEED_REENTRANT
+# define _REENTRANT /* Necessary to use in Solaris, since the silly guys at
+                       Sun made the localtime_r() prototype dependent on it
+                       (or _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS) */
+# endif
+
+# ifdef HAVE_TIME_H
+#  include <time.h>
+# endif
 #endif
 
 /* Since the code of getdate.y is not included in the Emacs executable
@@ -914,14 +924,20 @@ difftm (struct tm *a, struct tm *b)
 }
 
 time_t
-get_date (const char *p, const time_t *now)
+curl_getdate (const char *p, const time_t *now)
 {
   struct tm tm, tm0, *tmp;
   time_t Start;
-
+#ifdef HAVE_LOCALTIME_R
+  struct tm keeptime;
+#endif
   yyInput = p;
   Start = now ? *now : time ((time_t *) NULL);
+#ifdef HAVE_LOCALTIME_R
+  tmp = localtime_r(&Start, &keeptime);
+#else
   tmp = localtime (&Start);
+#endif
   if (!tmp)
     return -1;
   yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
@@ -1048,7 +1064,7 @@ main (ac, av)
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
     {
-      d = get_date (buff, (time_t *) NULL);
+      d = curl_getdate (buff, (time_t *) NULL);
       if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
       else

lib/getenv.c

@@ -22,23 +22,11 @@
  *  Portions created by the Initial Developer are Copyright (C) 1998.
  *  All Rights Reserved.
  *
- *  Contributor(s):
- *   Rafael Sagula <sagula@inf.ufrgs.br>
- *   Sampo Kellomaki <sampo@iki.fi>
- *   Linas Vepstas <linas@linas.org>
- *   Bjorn Reese <breese@imada.ou.dk>
- *   Johan Anderson <johan@homemail.com>
- *   Kjell Ericson <Kjell.Ericson@haxx.nu>
- *   Troy Engel <tengel@palladium.net>
- *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
- *   Angus Mackay <amackay@gus.ml.org>
- *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -47,28 +35,11 @@
  * $State$
  * $Locker$
  *
- * ------------------------------------------------------------
- * $Log$
- * Revision 1.2  2000-01-10 23:36:14  bagder
- * syncing with local edit
- *
- * Revision 1.4  1999/09/06 06:59:40  dast
- * Changed email info
- *
- * Revision 1.3  1999/08/13 07:34:48  dast
- * Changed the URL in the header
- *
- * Revision 1.2  1999/03/13 00:56:09  dast
- * Big changes done due to url.c being split up in X smaller files and that
- * the lib is now more stand-alone.
- *
- * Revision 1.1.1.1  1999/03/11 22:23:34  dast
- * Imported sources
- *
  ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -78,7 +49,7 @@ char *GetEnv(char *variable)
 {
 #ifdef WIN32
   /* This shit requires windows.h (HUGE) to be included */
-  static char env[MAX_PATH]; /* MAX_PATH is from windef.h */
+  char env[MAX_PATH]; /* MAX_PATH is from windef.h */
   char *temp = getenv(variable);
   env[0] = '\0';
   ExpandEnvironmentStrings(temp, env, sizeof(env));
@@ -86,10 +57,10 @@ char *GetEnv(char *variable)
   /* no length control */
   char *env = getenv(variable);
 #endif
-  return env;
+  return env?strdup(env):NULL;
 }
 
-char *curl_GetEnv(char *v)
+char *curl_getenv(char *v)
 {
   return GetEnv(v);
 }

lib/getenv.h

@@ -30,17 +30,17 @@
  *   Linas Vepstas <linas@linas.org>
  *   Bjorn Reese <breese@imada.ou.dk>
  *   Johan Anderson <johan@homemail.com>
- *   Kjell Ericson <Kjell.Ericson@haxx.nu>
+ *   Kjell Ericson <Kjell.Ericson@haxx.se>
  *   Troy Engel <tengel@palladium.net>
  *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
+ *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
  *   Angus Mackay <amackay@gus.ml.org>
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -51,7 +51,10 @@
  *
  * ------------------------------------------------------------
  * $Log$
- * Revision 1.2  2000-01-10 23:36:14  bagder
+ * Revision 1.3  2000-06-20 15:31:26  bagder
+ * haxx.nu => haxx.se
+ *
+ * Revision 1.2  2000/01/10 23:36:14  bagder
  * syncing with local edit
  *
  * Revision 1.3  1999/09/06 06:59:40  dast

lib/getpass.c

@@ -31,7 +31,7 @@
  *   Angus Mackay <amackay@gus.ml.org>
  *
  * Contributor(s):
- *   Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ *   Daniel Stenberg <daniel@haxx.se>
  */
 
 #ifndef WIN32
@@ -175,7 +175,9 @@ char *getpass(const char *prompt)
 #endif
   
   signal(SIGINT, sigint);
+#ifndef __EMX__
   signal(SIGTSTP, sigtstp);
+#endif
 
   return(buf);
 }

lib/highlevel.c

@@ -0,0 +1,731 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 1998.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <daniel@haxx.se>
+ *
+ * 	http://curl.haxx.se
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+
+#include "setup.h"
+
+/* -- WIN32 approved -- */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+
+#include "strequal.h"
+
+#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
+#include <winsock.h>
+#include <time.h>
+#include <io.h>
+#else
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#ifdef HAVE_UNISTD_H
+#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>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifndef HAVE_SELECT
+#error "We can't compile without select() support!"
+#endif
+#ifndef HAVE_SOCKET
+#error "We can't compile without socket() support!"
+#endif
+
+#endif
+
+#include "urldata.h"
+#include <curl/curl.h>
+#include <curl/types.h>
+#include "netrc.h"
+
+#include "getenv.h"
+#include "hostip.h"
+#include "download.h"
+#include "sendf.h"
+#include "speedcheck.h"
+#include "getpass.h"
+#include "progress.h"
+#include "getdate.h"
+#include "writeout.h"
+
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+CURLcode 
+_Transfer(struct connectdata *c_conn)
+{
+  size_t nread;                 /* number of bytes read */
+  int bytecount = 0;            /* total number of bytes read */
+  int writebytecount = 0;       /* number of bytes written */
+  long contentlength=0;         /* size of incoming data */
+  struct timeval start = tvnow();
+  struct timeval now = start;   /* current time */
+  bool header = TRUE;		/* incoming data has HTTP header */
+  int headerline = 0;		/* counts header lines to better track the
+                                   first one */
+  char *hbufp;			/* points at *end* of header line */
+  int hbuflen = 0;
+  char *str;			/* within buf */
+  char *str_start;		/* within buf */
+  char *end_ptr;		/* within buf */
+  char *p;			/* within headerbuff */
+  bool content_range = FALSE;	/* set TRUE if Content-Range: was found */
+  int offset = 0;		/* possible resume offset read from the
+                                   Content-Range: header */
+  int code = 0;			/* error code from the 'HTTP/1.? XXX' line */
+
+  /* for the low speed checks: */
+  CURLcode urg;
+  time_t timeofdoc=0;
+  long bodywrites=0;
+
+  char newurl[URL_MAX_LENGTH];		/* buffer for Location: URL */
+
+  /* the highest fd we use + 1 */
+  struct UrlData *data;
+  struct connectdata *conn = (struct connectdata *)c_conn;
+  char *buf;
+  int maxfd;
+
+  if(!conn || (conn->handle != STRUCT_CONNECT))
+    return CURLE_BAD_FUNCTION_ARGUMENT;
+  
+  data = conn->data; /* there's the root struct */
+  buf = data->buffer;
+  maxfd = (conn->sockfd>conn->writesockfd?conn->sockfd:conn->writesockfd)+1;
+
+  hbufp = data->headerbuff;
+
+  myalarm (0);			/* switch off the alarm-style timeout */
+
+  now = tvnow();
+  start = now;
+
+#define KEEP_READ  1
+#define KEEP_WRITE 2
+
+  pgrsTime(data, TIMER_PRETRANSFER);
+
+  if (!conn->getheader) {
+    header = FALSE;
+    if(conn->size > 0)
+      pgrsSetDownloadSize(data, conn->size);
+  }
+  {
+    fd_set readfd;
+    fd_set writefd;
+    fd_set rkeepfd;
+    fd_set wkeepfd;
+    struct timeval interval;
+    int keepon=0;
+
+    /* timeout every X second
+       - makes a better progressmeter (i.e even when no data is read, the
+       meter can be updated and reflect reality)
+       - allows removal of the alarm() crap
+       - variable timeout is easier
+     */
+
+    FD_ZERO (&readfd);		/* clear it */
+    if(conn->sockfd != -1) {
+      FD_SET (conn->sockfd, &readfd); /* read socket */
+      keepon |= KEEP_READ;
+    }
+
+    FD_ZERO (&writefd);		/* clear it */
+    if(conn->writesockfd != -1) {
+      FD_SET (conn->writesockfd, &writefd); /* write socket */
+      keepon |= KEEP_WRITE;
+    }
+
+    /* get these in backup variables to be able to restore them on each lap in
+       the select() loop */
+    rkeepfd = readfd;
+    wkeepfd = writefd;
+
+    while (keepon) {
+      readfd = rkeepfd;		/* set those every lap in the loop */
+      writefd = wkeepfd;
+      interval.tv_sec = 1;
+      interval.tv_usec = 0;
+
+      switch (select (maxfd, &readfd, &writefd, NULL, &interval)) {
+      case -1:			/* select() error, stop reading */
+#ifdef EINTR
+        /* The EINTR is not serious, and it seems you might get this more
+           ofen when using the lib in a multi-threaded environment! */
+        if(errno == EINTR)
+          ;
+        else
+#endif
+          keepon = 0; /* no more read or write */
+	continue;
+      case 0:			/* timeout */
+	break;
+      default:
+        if((keepon & KEEP_READ) && FD_ISSET(conn->sockfd, &readfd)) {
+          /* read! */
+          urg = curl_read(conn, buf, BUFSIZE -1, &nread);
+
+          /* NULL terminate, allowing string ops to be used */
+          if (0 < (signed int) nread)
+            buf[nread] = 0;
+
+          /* if we receive 0 or less here, the server closed the connection and
+             we bail out from this! */
+          else if (0 >= (signed int) nread) {
+            keepon &= ~KEEP_READ;
+            break;
+          }
+
+          str = buf;		/* Default buffer to use when we write the
+                                   buffer, it may be changed in the flow below
+                                   before the actual storing is done. */
+
+          /* Since this is a two-state thing, we check if we are parsing
+             headers at the moment or not. */
+          
+          if (header) {
+            /* we are in parse-the-header-mode */
+
+            /* header line within buffer loop */
+            do {
+              int hbufp_index;
+              
+              str_start = str;	/* str_start is start of line within buf */
+              
+              end_ptr = strchr (str_start, '\n');
+              
+              if (!end_ptr) {
+                /* no more complete header lines within buffer */
+                /* copy what is remaining into headerbuff */
+                int str_length = (int)strlen(str);
+                
+                if (hbuflen + (int)str_length >= data->headersize) {
+                  char *newbuff;
+                  long newsize=MAX((hbuflen+str_length)*3/2,
+                                   data->headersize*2);
+                  hbufp_index = hbufp - data->headerbuff;
+                  newbuff = (char *)realloc(data->headerbuff, newsize);
+                  if(!newbuff) {
+                    failf (data, "Failed to alloc memory for big header!");
+                    return CURLE_READ_ERROR;
+                  }
+                  data->headersize=newsize;
+                  data->headerbuff = newbuff;
+                  hbufp = data->headerbuff + hbufp_index;
+                }
+                strcpy (hbufp, str);
+                hbufp += strlen (str);
+                hbuflen += strlen (str);
+                break;		/* read more and try again */
+              }
+
+              str = end_ptr + 1;	/* move just past new line */
+
+              if (hbuflen + (str - str_start) >= data->headersize) {
+                char *newbuff;
+                long newsize=MAX((hbuflen+(str-str_start))*3/2,
+                                 data->headersize*2);
+                hbufp_index = hbufp - data->headerbuff;
+                newbuff = (char *)realloc(data->headerbuff, newsize);
+                if(!newbuff) {
+                  failf (data, "Failed to alloc memory for big header!");
+                  return CURLE_READ_ERROR;
+                }
+                data->headersize= newsize;
+                data->headerbuff = newbuff;
+                hbufp = data->headerbuff + hbufp_index;
+              }
+
+              /* copy to end of line */
+              strncpy (hbufp, str_start, str - str_start);
+              hbufp += str - str_start;
+              hbuflen += str - str_start;
+              *hbufp = 0;
+              
+              p = data->headerbuff;
+              
+              /* we now have a full line that p points to */
+              if (('\n' == *p) || ('\r' == *p)) {
+                /* Zero-length line means end of header! */
+                if (-1 != conn->size)	/* if known */
+                  conn->size += bytecount; /* we append the already read size */
+
+
+                if ('\r' == *p)
+                  p++;		/* pass the \r byte */
+                if ('\n' == *p)
+                  p++;		/* pass the \n byte */
+
+                pgrsSetDownloadSize(data, conn->size);
+
+                header = FALSE;	/* no more header to parse! */
+
+                /* now, only output this if the header AND body are requested:
+                 */
+                if (data->bits.http_include_header) {
+                  if((p - data->headerbuff) !=
+                     data->fwrite (data->headerbuff, 1,
+                                   p - data->headerbuff, data->out)) {
+                    failf (data, "Failed writing output");
+                    return CURLE_WRITE_ERROR;
+                  }
+                }
+                if(data->writeheader) {
+                  /* obviously, the header is requested to be written to
+                     this file: */
+                  if((p - data->headerbuff) !=
+                     data->fwrite (data->headerbuff, 1, p - data->headerbuff,
+                                   data->writeheader)) {
+                    failf (data, "Failed writing output");
+                    return CURLE_WRITE_ERROR;
+                  }
+                }
+                break;		/* exit header line loop */
+              }
+              
+              if (!headerline++) {
+                /* This is the first header, it MUST be the error code line
+                   or else we consiser this to be the body right away! */
+                if (sscanf (p, " HTTP/1.%*c %3d", &code)) {
+                  /* 404 -> URL not found! */
+                  if (
+                      ( ((data->bits.http_follow_location) && (code >= 400))
+                        ||
+                        (!data->bits.http_follow_location && (code >= 300)))
+                      && (data->bits.http_fail_on_error)) {
+                    /* If we have been told to fail hard on HTTP-errors,
+                       here is the check for that: */
+                    /* serious error, go home! */
+                    failf (data, "The requested file was not found");
+                    return CURLE_HTTP_NOT_FOUND;
+                  }
+                  data->progress.httpcode = code;
+                }
+                else {
+                  header = FALSE;	/* this is not a header line */
+                  break;
+                }
+              }
+              /* check for Content-Length: header lines to get size */
+              if (strnequal("Content-Length", p, 14) &&
+                  sscanf (p+14, ": %ld", &contentlength))
+                conn->size = contentlength;
+              else if (strnequal("Content-Range", p, 13)) {
+                if (sscanf (p+13, ": bytes %d-", &offset) ||
+                    sscanf (p+13, ": bytes: %d-", &offset)) {
+                  /* This second format was added August 1st by Igor
+                     Khristophorov since Sun's webserver JavaWebServer/1.1.1
+                     obviously sends the header this way! :-( */
+                  if (data->resume_from == offset) {
+                    /* we asked for a resume and we got it */
+                    content_range = TRUE;
+                  }
+                }
+              }
+              else if(data->cookies &&
+                      strnequal("Set-Cookie: ", p, 11)) {
+                cookie_add(data->cookies, TRUE, &p[12]);
+              }
+              else if(strnequal("Last-Modified:", p,
+                                strlen("Last-Modified:")) &&
+                      data->timecondition) {
+                time_t secs=time(NULL);
+                timeofdoc = curl_getdate(p+strlen("Last-Modified:"), &secs);
+              }
+              else if ((code >= 300 && code < 400) &&
+                       (data->bits.http_follow_location) &&
+                       strnequal("Location", p, 8) &&
+                       sscanf (p+8, ": %" URL_MAX_LENGTH_TXT "s",
+                               newurl)) {
+                /* this is the URL that the server advices us to get
+                   instead */
+                data->newurl = strdup (newurl);
+              }
+              
+              if (data->bits.http_include_header) {
+                if(hbuflen != data->fwrite (p, 1, hbuflen, data->out)) {
+                  failf (data, "Failed writing output");
+                  return CURLE_WRITE_ERROR;
+                }
+              }
+              if(data->writeheader) {
+                /* the header is requested to be written to this file */
+                if(hbuflen != data->fwrite (p, 1, hbuflen,
+                                            data->writeheader)) {
+                  failf (data, "Failed writing output");
+                  return CURLE_WRITE_ERROR;
+                }
+              }
+              
+              /* reset hbufp pointer && hbuflen */
+              hbufp = data->headerbuff;
+              hbuflen = 0;
+            }
+            while (*str);		/* header line within buffer */
+
+            /* We might have reached the end of the header part here, but
+               there might be a non-header part left in the end of the read
+               buffer. */
+
+            if (!header) {
+              /* the next token and forward is not part of
+                 the header! */
+
+              /* we subtract the remaining header size from the buffer */
+              nread -= (str - buf);
+            }
+
+          }			/* end if header mode */
+
+          /* This is not an 'else if' since it may be a rest from the header
+             parsing, where the beginning of the buffer is headers and the end
+             is non-headers. */
+          if (str && !header && ((signed int)nread > 0)) {
+            
+            if(0 == bodywrites) {
+              /* These checks are only made the first time we are about to
+                 write a chunk of the body */
+              if(conn->protocol&PROT_HTTP) {
+                /* HTTP-only checks */
+                if (data->resume_from && !content_range ) {
+                  /* we wanted to resume a download, although the server
+                     doesn't seem to support this */
+                  failf (data, "HTTP server doesn't seem to support byte ranges. Cannot resume.");
+                  return CURLE_HTTP_RANGE_ERROR;
+                }
+                else if (data->newurl) {
+                  /* abort after the headers if "follow Location" is set */
+                  infof (data, "Follow to new URL: %s\n", data->newurl);
+                  return CURLE_OK;
+                }
+                else if(data->timecondition && !data->range) {
+                  /* A time condition has been set AND no ranges have been
+                     requested. This seems to be what chapter 13.3.4 of
+                     RFC 2616 defines to be the correct action for a
+                     HTTP/1.1 client */
+                  if((timeofdoc > 0) && (data->timevalue > 0)) {
+                    switch(data->timecondition) {
+                    case TIMECOND_IFMODSINCE:
+                    default:
+                      if(timeofdoc < data->timevalue) {
+                        infof(data,
+                              "The requested document is not new enough");
+                        return CURLE_OK;
+                      }
+                      break;
+                    case TIMECOND_IFUNMODSINCE:
+                      if(timeofdoc > data->timevalue) {
+                        infof(data,
+                              "The requested document is not old enough");
+                        return CURLE_OK;
+                      }
+                      break;
+                    } /* switch */
+                  } /* two valid time strings */
+                } /* we have a time condition */
+              } /* this is HTTP */
+            } /* this is the first time we write a body part */
+            bodywrites++;
+
+            if(data->maxdownload &&
+               (bytecount + nread > data->maxdownload)) {
+              nread = data->maxdownload - bytecount;
+              if((signed int)nread < 0 ) /* this should be unusual */
+                nread = 0;
+              keepon &= ~KEEP_READ; /* we're done reading */
+            }
+
+            bytecount += nread;
+
+            pgrsSetDownloadCounter(data, (double)bytecount);
+            
+            if (nread != data->fwrite (str, 1, nread, data->out)) {
+              failf (data, "Failed writing output");
+              return CURLE_WRITE_ERROR;
+            }
+
+          } /* if (! header and data to read ) */
+        } /* if( read from socket ) */
+
+        if((keepon & KEEP_WRITE) && FD_ISSET(conn->writesockfd, &writefd)) {
+          /* write */
+
+          char scratch[BUFSIZE * 2];
+          int i, si;
+          size_t bytes_written;
+
+          if(data->crlf)
+            buf = data->buffer; /* put it back on the buffer */
+
+          nread = data->fread(buf, 1, BUFSIZE, data->in);
+
+          /* the signed int typecase of nread of for systems that has
+             unsigned size_t */
+          if ((signed int)nread<=0) {
+            /* done */
+            keepon &= ~KEEP_WRITE; /* we're done writing */
+            break;
+          }
+          writebytecount += nread;
+          pgrsSetUploadCounter(data, (double)writebytecount);            
+
+          /* convert LF to CRLF if so asked */
+          if (data->crlf) {
+            for(i = 0, si = 0; i < (int)nread; i++, si++) {
+              if (buf[i] == 0x0a) {
+                scratch[si++] = 0x0d;
+                scratch[si] = 0x0a;
+              }
+              else {
+                scratch[si] = buf[i];
+              }
+            }
+            nread = si;
+            buf = scratch; /* point to the new buffer */
+          }
+
+          /* write to socket */
+          urg = curl_write(conn, buf, nread, &bytes_written);
+
+          if(nread != bytes_written) {
+            failf(data, "Failed uploading data");
+            return CURLE_WRITE_ERROR;
+          }
+
+        }
+
+        break;
+      }
+
+      now = tvnow();
+      if(pgrsUpdate(data))
+        urg = CURLE_ABORTED_BY_CALLBACK;
+      else
+        urg = speedcheck (data, now);
+      if (urg)
+	return urg;
+
+      if (data->timeout && (tvdiff (now, start) > data->timeout)) {
+	failf (data, "Operation timed out with %d out of %d bytes received",
+	       bytecount, conn->size);
+	return CURLE_OPERATION_TIMEOUTED;
+      }
+    }
+  }
+  if(!(data->bits.no_body) && contentlength &&
+     (bytecount != contentlength)) {
+    failf(data, "transfer closed with %d bytes remaining to read",
+          contentlength-bytecount);
+    return CURLE_PARTIAL_FILE;
+  }
+  if(pgrsUpdate(data))
+    return CURLE_ABORTED_BY_CALLBACK;
+
+  if(conn->bytecountp)
+    *conn->bytecountp = bytecount; /* read count */
+  if(conn->writebytecountp)
+    *conn->writebytecountp = writebytecount; /* write count */
+
+  return CURLE_OK;
+}
+
+typedef int (*func_T)(void);
+
+CURLcode curl_transfer(CURL *curl)
+{
+  CURLcode res;
+  struct UrlData *data = curl;
+  struct connectdata *c_connect;
+
+  pgrsStartNow(data);
+
+  do {
+    res = curl_connect(curl, (CURLconnect **)&c_connect);
+    if(res == CURLE_OK) {
+      res = curl_do(c_connect);
+      if(res == CURLE_OK) {
+        res = _Transfer(c_connect); /* now fetch that URL please */
+        if(res == CURLE_OK)
+          res = curl_done(c_connect);
+      }
+
+      if((res == CURLE_OK) && data->newurl) {
+        /* Location: redirect */
+        char prot[16];
+        char path[URL_MAX_LENGTH];
+
+        /* mark the next request as a followed location: */
+        data->bits.this_is_a_follow = TRUE;
+
+        if(data->bits.http_auto_referer) {
+          /* We are asked to automatically set the previous URL as the
+             referer when we get the next URL. We pick the ->url field,
+             which may or may not be 100% correct */
+
+          if(data->free_referer) {
+            /* If we already have an allocated referer, free this first */
+            free(data->referer);
+          }
+
+          data->referer = strdup(data->url);
+          data->free_referer = TRUE; /* yes, free this later */
+          data->bits.http_set_referer = TRUE; /* might have been false */
+        }
+
+        if(2 != sscanf(data->newurl, "%15[^:]://%" URL_MAX_LENGTH_TXT
+                       "s", prot, path)) {
+          /***
+           *DANG* this is an RFC 2068 violation. The URL is supposed
+           to be absolute and this doesn't seem to be that!
+           ***
+           Instead, we have to TRY to append this new path to the old URL
+           to the right of the host part. Oh crap, this is doomed to cause
+           problems in the future...
+          */
+          char *protsep;
+          char *pathsep;
+          char *newest;
+
+          /* protsep points to the start of the host name */
+          protsep=strstr(data->url, "//");
+          if(!protsep)
+            protsep=data->url;
+          else {
+            /* TBD: set the port with curl_setopt() */
+            data->port=0; /* we got a full URL and then we should reset the
+                             port number here to re-initiate it later */
+            protsep+=2; /* pass the slashes */
+          }
+
+          if('/' != data->newurl[0]) {
+            /* First we need to find out if there's a ?-letter in the URL,
+               and cut it and the right-side of that off */
+            pathsep = strrchr(protsep, '?');
+            if(pathsep)
+              *pathsep=0;
+
+            /* we have a relative path to append to the last slash if
+               there's one available */
+            pathsep = strrchr(protsep, '/');
+            if(pathsep)
+              *pathsep=0;
+          }
+          else {
+            /* We got a new absolute path for this server, cut off from the
+               first slash */
+            pathsep = strchr(protsep, '/');
+            if(pathsep)
+              *pathsep=0;
+          }
+
+          newest=(char *)malloc( strlen(data->url) +
+                                 1 + /* possible slash */
+                                 strlen(data->newurl) + 1/* zero byte */);
+
+          if(!newest)
+            return CURLE_OUT_OF_MEMORY;
+          sprintf(newest, "%s%s%s", data->url, ('/' == data->newurl[0])?"":"/",
+                  data->newurl);
+          free(data->newurl);
+          data->newurl = newest;
+        }
+        else {
+          /* This was an absolute URL, clear the port number! */
+          /* TBD: set the port with curl_setopt() */
+          data->port = 0;
+        }
+      
+        /* TBD: set the URL with curl_setopt() */
+        data->url = data->newurl;
+        data->newurl = NULL; /* don't show! */
+
+        /* Disable both types of POSTs, since doing a second POST when
+           following isn't what anyone would want! */
+        data->bits.http_post = FALSE;
+        data->bits.http_formpost = FALSE;
+
+        infof(data, "Follows Location: to new URL: '%s'\n", data->url);
+
+        curl_disconnect(c_connect);
+        continue;
+      }
+
+      curl_disconnect(c_connect);
+    }
+    break; /* it only reaches here when this shouldn't loop */
+
+  } while(1); /* loop if Location: */
+
+  if(data->newurl)
+    free(data->newurl);
+
+  if((CURLE_OK == res) && data->writeinfo) {
+    /* Time to output some info to stdout */
+    WriteOut(data);
+  }
+  return res;
+}
+

lib/highlevel.h

@@ -0,0 +1,43 @@
+#ifndef __HIGHLEVEL_H
+#define __HIGHLEVEL_H
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 1998.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <daniel@haxx.se>
+ *
+ * 	http://curl.haxx.se
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+CURLcode curl_transfer(CURL *curl);
+#endif

lib/hostip.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,10 +38,14 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-#include <string.h>
-
 #include "setup.h"
 
+#include <string.h>
+#include <malloc.h>
+#include <errno.h>
+
+#define _REENTRANT
+
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #else
@@ -51,8 +55,12 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -61,51 +69,109 @@
 #include "urldata.h"
 #include "sendf.h"
 
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
+#include "inet_ntoa_r.h"
+#endif
+
 /* --- resolve name or IP-number --- */
 
-char *MakeIP(unsigned long num)
+char *MakeIP(unsigned long num,char *addr, int addr_len)
 {
-#ifdef HAVE_INET_NTOA
+#if defined(HAVE_INET_NTOA) || defined(HAVE_INET_NTOA_R)
   struct in_addr in;
-
   in.s_addr = htonl(num);
-  return (inet_ntoa(in));
+
+#if defined(HAVE_INET_NTOA_R)
+  inet_ntoa_r(in,addr,addr_len);
+#else
+  strncpy(addr,inet_ntoa(in),addr_len);
+#endif
 #else
-  static char addr[128];
   unsigned char *paddr;
 
   num = htonl(num);  /* htonl() added to avoid endian probs */
   paddr = (unsigned char *)&num;
   sprintf(addr, "%u.%u.%u.%u", paddr[0], paddr[1], paddr[2], paddr[3]);
-  return (addr);
 #endif
+  return (addr);
 }
 
-/* Stolen from Dancer source code, written by
-   Bjorn Reese <breese@imada.ou.dk> */
+/* The original code to this function was stolen from the Dancer source code,
+   written by Bjorn Reese, it has since been patched and modified. */
 #ifndef INADDR_NONE
 #define INADDR_NONE (unsigned long) ~0
 #endif
-struct hostent *GetHost(struct UrlData *data, char *hostname)
+struct hostent *GetHost(struct UrlData *data,
+                        char *hostname,
+                        char *buf,
+                        int buf_size )
 {
   struct hostent *h = NULL;
   unsigned long in;
-  static struct hostent he;
-  static char name[MAXHOSTNAMELEN];
-  static char *addrlist[2];
-  static struct in_addr addrentry;
+  int ret;
 
   if ( (in=inet_addr(hostname)) != INADDR_NONE ) {
-    addrentry.s_addr = in;
-    addrlist[0] = (char *)&addrentry;
-    addrlist[1] = NULL;
-    he.h_name = strncpy(name, MakeIP(ntohl(in)), MAXHOSTNAMELEN);
-    he.h_addrtype = AF_INET;
-    he.h_length = sizeof(struct in_addr);
-    he.h_addr_list = addrlist;
-    h = &he;
-  } else if ( (h=gethostbyname(hostname)) == NULL ) {
+    struct in_addr *addrentry;
+
+    h = (struct hostent*)buf;
+    h->h_addr_list = (char**)(buf + sizeof(*h));
+    addrentry = (struct in_addr*)(h->h_addr_list + 2);
+    addrentry->s_addr = in;
+    h->h_addr_list[0] = (char*)addrentry;
+    h->h_addr_list[1] = NULL;
+    h->h_addrtype = AF_INET;
+    h->h_length = sizeof(*addrentry);
+    h->h_name = *(h->h_addr_list) + h->h_length;
+    /* bad one h->h_name = (char*)(h->h_addr_list + h->h_length); */
+    MakeIP(ntohl(in),h->h_name,buf_size - (long)(h->h_name) + (long)buf);
+  }
+#if defined(HAVE_GETHOSTBYNAME_R)
+  else {
+    int h_errnop;
+    memset(buf,0,buf_size);	/* workaround for gethostbyname_r bug in qnx nto */
+#ifdef HAVE_GETHOSTBYNAME_R_5
+    /* Solaris, IRIX and more */
+    if ((h = gethostbyname_r(hostname,
+                             (struct hostent *)buf,
+                             buf + sizeof(struct hostent),
+                             buf_size - sizeof(struct hostent),
+                             &h_errnop)) == NULL )
+#endif
+#ifdef HAVE_GETHOSTBYNAME_R_6
+    /* Linux */
+    if( gethostbyname_r(hostname,
+                        (struct hostent *)buf,
+                        buf + sizeof(struct hostent),
+                        buf_size - sizeof(struct hostent),
+                        &h, /* DIFFERENCE */
+                        &h_errnop))
+#endif
+#ifdef HAVE_GETHOSTBYNAME_R_3
+    /* AIX, Digital Unix, HPUX 10, more? */
+
+    /* August 4th, 2000. I don't have any such system around so I write this
+       blindly in hope it might work or that someone else will help me fix
+       this. August 22nd, 2000: Albert Chin-A-Young brought an updated version
+       that should work! */
+
+    ret = gethostbyname_r(hostname,
+                        (struct hostent *)buf,
+                        (struct hostent_data *)(buf + sizeof(struct hostent)));
+
+    /* result expected in h */
+    h = (struct hostent*)buf;
+    h_errnop= errno; /* we don't deal with this, but set it anyway */
+    if(ret)
+#endif
+      {
+      infof(data, "gethostbyname_r(2) failed for %s\n", hostname);
+    }
+#else
+  else {
+    if ((h = gethostbyname(hostname)) == NULL ) {
       infof(data, "gethostbyname(2) failed for %s\n", hostname);
     }
+#endif
+  }
   return (h);
 }

lib/hostip.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,7 +40,7 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-struct hostent *GetHost(struct UrlData *data, char *hostname);
-char *MakeIP(unsigned long num);
+extern struct hostent *GetHost(struct UrlData *data, char *hostname, char *buf, int buf_size );
+extern char *MakeIP(unsigned long num,char *addr, int addr_len);
 
 #endif

lib/http.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,7 +51,12 @@
 
 #include <errno.h>
 
-#include "setup.h"
+
+#ifdef NEED_REENTRANT
+#define _REENTRANT /* Necessary to use in Solaris, since the silly guys at Sun
+                      made the localtime_r() prototype dependent on it (or
+                      _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS). */
+#endif
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
@@ -59,8 +66,17 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include <sys/time.h>
+
+#ifdef HAVE_TIME_H
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#endif
+
 #include <sys/resource.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -94,6 +110,9 @@
 #include "progress.h"
 #include "base64.h"
 #include "cookie.h"
+#include "strequal.h"
+#include "url.h"
+#include "ssluse.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -104,44 +123,141 @@
  */
 bool static checkheaders(struct UrlData *data, char *thisheader)
 {
-  struct HttpHeader *head;
+  struct curl_slist *head;
   size_t thislen = strlen(thisheader);
 
   for(head = data->headers; head; head=head->next) {
-    if(strnequal(head->header, thisheader, thislen)) {
+    if(strnequal(head->data, thisheader, thislen)) {
       return TRUE;
     }
   }
   return FALSE;
 }
 
-UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
+CURLcode http_connect(struct connectdata *conn)
 {
-  /* Send the GET line to the HTTP server */
+  struct UrlData *data;
 
-  struct FormData *sendit=NULL;
-  int postsize=0;
-  UrgError result;
-  char *buf;
-  struct Cookie *co = NULL;
-  char *p_pragma = NULL;
-  char *p_accept = NULL;
-  long readbytecount;
-  long writebytecount;
+  data=conn->data;
 
-  buf = data->buffer; /* this is our buffer */
+  /* If we are not using a proxy and we want a secure connection,
+   * perform SSL initialization & connection now.
+   * If using a proxy with https, then we must tell the proxy to CONNECT
+   * us to the host we want to talk to.  Only after the connect
+   * has occured, can we start talking SSL
+   */
+   if (conn->protocol & PROT_HTTPS) {
+     if (data->bits.httpproxy) {
 
-  if ( (data->conf&(CONF_HTTP|CONF_FTP)) &&
-       (data->conf&CONF_UPLOAD)) {
-    data->conf |= CONF_PUT;
+        /* OK, now send the connect statment */
+        sendf(data->firstsocket, data,
+              "CONNECT %s:%d HTTP/1.0\015\012"
+              "%s"
+	      "%s"
+              "\r\n",
+              data->hostname, data->remote_port,
+              (data->bits.proxy_user_passwd)?data->ptr_proxyuserpwd:"",
+	      (data->useragent?data->ptr_uagent:"")
+              );
+
+        /* wait for the proxy to send us a HTTP/1.0 200 OK header */
+	/* Daniel rewrote this part Nov 5 1998 to make it more obvious */
+	{
+	  int httperror=0;
+	  int subversion=0;
+	  while(GetLine(data->firstsocket, data->buffer, data)) {
+	    if('\r' == data->buffer[0])
+	      break; /* end of headers */
+	    if(2 == sscanf(data->buffer, "HTTP/1.%d %d",
+			   &subversion,
+			   &httperror)) {
+	      ;
 	    }
-#if 0 /* old version */
-  if((data->conf&(CONF_HTTP|CONF_UPLOAD)) ==
-     (CONF_HTTP|CONF_UPLOAD)) {
-    /* enable PUT! */
-    data->conf |= CONF_PUT;
 	  }
-#endif
+	  if(200 != httperror) {
+	    if(407 == httperror)
+	      /* Added Nov 6 1998 */
+	      failf(data, "Proxy requires authorization!");
+	    else 
+	      failf(data, "Received error code %d from proxy", httperror);
+	    return CURLE_READ_ERROR;
+	  }
+	}
+        infof (data, "Proxy has replied to CONNECT request\n");
+     }
+
+      /* now, perform the SSL initialization for this socket */
+     if(UrgSSLConnect (data)) {
+       return CURLE_SSL_CONNECT_ERROR;
+     }
+  }
+
+   if(data->bits.user_passwd && !data->bits.this_is_a_follow) {
+     /* Authorization: is requested, this is not a followed location, get the
+        original host name */
+     data->auth_host = strdup(data->hostname);
+   }
+
+   return CURLE_OK;
+}
+
+/* called from curl_close() when this struct is about to get wasted, free
+   protocol-specific resources */
+CURLcode http_close(struct connectdata *conn)
+{
+  if(conn->data->auth_host)
+    free(conn->data->auth_host);
+  return CURLE_OK;
+}
+
+CURLcode http_done(struct connectdata *conn)
+{
+  struct UrlData *data;
+  long *bytecount = &conn->bytecount;
+  struct HTTP *http;
+
+  data=conn->data;
+  http=data->proto.http;
+
+  if(data->bits.http_formpost) {
+    *bytecount = http->readbytecount + http->writebytecount;
+      
+    FormFree(http->sendit); /* Now free that whole lot */
+
+    data->fread = http->storefread; /* restore */
+    data->in = http->in; /* restore */
+  }
+  else if(data->bits.http_put) {
+    *bytecount = http->readbytecount + http->writebytecount;
+  }
+
+  /* TBD: the HTTP struct remains allocated here */
+
+  return CURLE_OK;
+}
+
+
+CURLcode http(struct connectdata *conn)
+{
+  struct UrlData *data=conn->data;
+  char *buf = data->buffer; /* this is a short cut to the buffer */
+  CURLcode result=CURLE_OK;
+  struct HTTP *http;
+  struct Cookie *co=NULL; /* no cookies from start */
+  char *ppath = conn->ppath; /* three previous function arguments */
+  char *host = conn->name;
+  long *bytecount = &conn->bytecount;
+
+  http = (struct HTTP *)malloc(sizeof(struct HTTP));
+  if(!http)
+    return CURLE_OUT_OF_MEMORY;
+  memset(http, 0, sizeof(struct HTTP));
+  data->proto.http = http;
+
+  if ( (conn->protocol&(PROT_HTTP|PROT_FTP)) &&
+       data->bits.upload) {
+    data->bits.http_put=1;
+  }
   
   /* The User-Agent string has been built in url.c already, because it might
      have been used in the proxy connect, but if we have got a header with
@@ -152,17 +268,24 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
     data->ptr_uagent=NULL;
   }
 
-  if((data->conf & CONF_USERPWD) && !checkheaders(data, "Authorization:")) {
+  if((data->bits.user_passwd) && !checkheaders(data, "Authorization:")) {
     char authorization[512];
+
+    /* To prevent the user+password to get sent to other than the original
+       host due to a location-follow, we do some weirdo checks here */
+    if(!data->bits.this_is_a_follow ||
+       !data->auth_host ||
+       strequal(data->auth_host, data->hostname)) {
       sprintf(data->buffer, "%s:%s", data->user, data->passwd);
       base64Encode(data->buffer, authorization);
       data->ptr_userpwd = maprintf( "Authorization: Basic %s\015\012",
                                     authorization);
     }
-  if((data->conf & CONF_RANGE) && !checkheaders(data, "Range:")) {
+  }
+  if((data->bits.set_range) && !checkheaders(data, "Range:")) {
     data->ptr_rangeline = maprintf("Range: bytes=%s\015\012", data->range);
   }
-  if((data->conf & CONF_REFERER) && !checkheaders(data, "Referer:")) {
+  if((data->bits.http_set_referer) && !checkheaders(data, "Referer:")) {
     data->ptr_ref = maprintf("Referer: %s\015\012", data->referer);
   }
   if(data->cookie && !checkheaders(data, "Cookie:")) {
@@ -173,29 +296,30 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
     co = cookie_getlist(data->cookies,
                         host,
                         ppath,
-                        data->conf&CONF_HTTPS?TRUE:FALSE);
+                        conn->protocol&PROT_HTTPS?TRUE:FALSE);
   }
-  if ((data->conf & CONF_PROXY) && (!(data->conf & CONF_HTTPS)))  {
+  if ((data->bits.httpproxy) && !(conn->protocol&PROT_HTTPS))  {
     /* The path sent to the proxy is in fact the entire URL */
     strncpy(ppath, data->url, URL_MAX_LENGTH-1);
   }
-  if(data->conf & CONF_HTTPPOST) {
+  if(data->bits.http_formpost) {
     /* we must build the whole darned post sequence first, so that we have
        a size of the whole shebang before we start to send it */
-    sendit = getFormData(data->httppost, &postsize);
+    http->sendit = getFormData(data->httppost, &http->postsize);
   }
 
-  if(!checkheaders(data, "Host:"))
-    data->ptr_host = maprintf("Host: %s\r\n", host);
-
+  if(!checkheaders(data, "Host:")) {
+    data->ptr_host = maprintf("Host: %s:%d\r\n", host, data->remote_port);
+  }
 
   if(!checkheaders(data, "Pragma:"))
-    p_pragma = "Pragma: no-cache\r\n";
+    http->p_pragma = "Pragma: no-cache\r\n";
 
   if(!checkheaders(data, "Accept:"))
-    p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
+    http->p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
 
   do {
+    struct curl_slist *headers=data->headers;
     sendf(data->firstsocket, data,
           "%s " /* GET/HEAD/POST/PUT */
           "%s HTTP/1.0\r\n" /* path */
@@ -210,19 +334,19 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
           "%s", /* referer */
 
           data->customrequest?data->customrequest:
-          (data->conf&CONF_NOBODY?"HEAD":
-           (data->conf&(CONF_POST|CONF_HTTPPOST))?"POST":
-           (data->conf&CONF_PUT)?"PUT":"GET"),
+          (data->bits.no_body?"HEAD":
+           (data->bits.http_post || data->bits.http_formpost)?"POST":
+           (data->bits.http_put)?"PUT":"GET"),
           ppath,
-          (data->conf&CONF_PROXYUSERPWD && data->ptr_proxyuserpwd)?data->ptr_proxyuserpwd:"",
-          (data->conf&CONF_USERPWD && data->ptr_userpwd)?data->ptr_userpwd:"",
-          (data->conf&CONF_RANGE && data->ptr_rangeline)?data->ptr_rangeline:"",
+          (data->bits.proxy_user_passwd && data->ptr_proxyuserpwd)?data->ptr_proxyuserpwd:"",
+          (data->bits.user_passwd && data->ptr_userpwd)?data->ptr_userpwd:"",
+          (data->bits.set_range && data->ptr_rangeline)?data->ptr_rangeline:"",
           (data->useragent && *data->useragent && data->ptr_uagent)?data->ptr_uagent:"",
           (data->ptr_cookie?data->ptr_cookie:""), /* Cookie: <data> */
           (data->ptr_host?data->ptr_host:""), /* Host: host */
-          p_pragma?p_pragma:"",
-          p_accept?p_accept:"",
-          (data->conf&CONF_REFERER && data->ptr_ref)?data->ptr_ref:"" /* Referer: <data> <CRLF> */
+          http->p_pragma?http->p_pragma:"",
+          http->p_accept?http->p_accept:"",
+          (data->bits.http_set_referer && data->ptr_ref)?data->ptr_ref:"" /* Referer: <data> <CRLF> */
           );
 
     if(co) {
@@ -234,9 +358,10 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
             sendf(data->firstsocket, data,
                   "Cookie:");
           }
-          count++;
           sendf(data->firstsocket, data,
-                " %s=%s;", co->name, co->value);
+                "%s%s=%s", count?"; ":"", co->name,
+                co->value);
+          count++;
         }
         co = co->next; /* next cookie please */
       }
@@ -251,7 +376,17 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
     if(data->timecondition) {
       struct tm *thistime;
 
+#ifdef HAVE_LOCALTIME_R
+      /* thread-safe version */
+      struct tm keeptime;
+      thistime = (struct tm *)localtime_r(&data->timevalue, &keeptime);
+#else
       thistime = localtime(&data->timevalue);
+#endif
+      if(NULL == thistime) {
+        failf(data, "localtime() failed!");
+        return CURLE_OUT_OF_MEMORY;
+      }
 
 #ifdef HAVE_STRFTIME
       /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
@@ -277,71 +412,58 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
       }
     }
 
-    while(data->headers) {
+    while(headers) {
+      char *ptr = strchr(headers->data, ':');
+      if(ptr) {
+        /* we require a colon for this to be a true header */
+
+        ptr++; /* pass the colon */
+        while(*ptr && isspace(*ptr))
+          ptr++;
+
+        if(*ptr) {
+          /* only send this if the contents was non-blank */
+
           sendf(data->firstsocket, data,
                 "%s\015\012",
-            data->headers->header);
-      data->headers = data->headers->next;
+                headers->data);
+        }
+      }
+      headers = headers->next;
     }
 
-    if(data->conf&(CONF_POST|CONF_HTTPPOST)) {
-      if(data->conf & CONF_POST) {
-        /* this is the simple x-www-form-urlencoded style */
-        sendf(data->firstsocket, data,
-              "Content-Length: %d\015\012"
-              "Content-Type: application/x-www-form-urlencoded\r\n\r\n"
-              "%s\015\012",
-              strlen(data->postfields),
-              data->postfields );
-      }
-      else {
-        struct Form form;
-        size_t (*storefread)(char *, size_t , size_t , FILE *);
-        FILE *in;
-        long conf;
-
-        if(FormInit(&form, sendit)) {
+    if(data->bits.http_formpost) {
+      if(FormInit(&http->form, http->sendit)) {
         failf(data, "Internal HTTP POST error!\n");
-          return URG_HTTP_POST_ERROR;
+        return CURLE_HTTP_POST_ERROR;
       }
 
-        storefread = data->fread; /* backup */
-        in = data->in; /* backup */
+      http->storefread = data->fread; /* backup */
+      http->in = data->in; /* backup */
           
       data->fread =
         (size_t (*)(char *, size_t, size_t, FILE *))
         FormReader; /* set the read function to read from the
                        generated form data */
-        data->in = (FILE *)&form;
+      data->in = (FILE *)&http->form;
 
       sendf(data->firstsocket, data,
             "Content-Length: %d\r\n",
-              postsize-2);
+            http->postsize-2);
 
-	pgrsSetUploadSize(data, postsize);
-#if 0
-        ProgressInit(data, postsize);
-#endif
+      pgrsSetUploadSize(data, http->postsize);
 
-        result = Transfer(data, data->firstsocket, -1, TRUE, &readbytecount,
-                          data->firstsocket, &writebytecount);
-        *bytecount = readbytecount + writebytecount;
-
-        FormFree(sendit); /* Now free that whole lot */
-
-        if(result)
+      result = Transfer(conn, data->firstsocket, -1, TRUE,
+                        &http->readbytecount,
+                          data->firstsocket,
+                        &http->writebytecount);
+      if(result) {
+        FormFree(http->sendit); /* free that whole lot */
         return result;
-	
-        data->fread = storefread; /* restore */
-        data->in = in; /* restore */
-
-	sendf(data->firstsocket, data,
-	      "\r\n\r\n");
       }
     }
-    else if(data->conf&CONF_PUT) {
+    else if(data->bits.http_put) {
       /* Let's PUT the data to the server! */
-      long conf;
 
       if(data->infilesize>0) {
         sendf(data->firstsocket, data,
@@ -352,39 +474,55 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
         sendf(data->firstsocket, data,
               "\015\012");
 
-#if 0        
-      ProgressInit(data, data->infilesize);
-#endif
       pgrsSetUploadSize(data, data->infilesize);
 
-      result = Transfer(data, data->firstsocket, -1, TRUE, &readbytecount,
-                        data->firstsocket, &writebytecount);
-      
-      *bytecount = readbytecount + writebytecount;
-
+      result = Transfer(conn, data->firstsocket, -1, TRUE,
+                        &http->readbytecount,
+                        data->firstsocket,
+                        &http->writebytecount);
       if(result)
         return result;
       
     }
     else {
-      sendf(data->firstsocket, data, "\r\n");
+      if(data->bits.http_post) {
+        /* this is the simple POST, using x-www-form-urlencoded style */
+
+        if(!checkheaders(data, "Content-Length:"))
+          /* we allow replacing this header, although it isn't very wise to
+             actually set your own */
+          sendf(data->firstsocket, data,
+                "Content-Length: %d\r\n",
+                (data->postfieldsize?data->postfieldsize:
+                 strlen(data->postfields)) );
+
+        if(!checkheaders(data, "Content-Type:"))
+          sendf(data->firstsocket, data,
+                "Content-Type: application/x-www-form-urlencoded\r\n");
+
+        /* and here comes the actual data */
+        if(data->postfieldsize) {
+          ssend(data->firstsocket, data, "\r\n", 2);
+          ssend(data->firstsocket, data, data->postfields, data->postfieldsize);
+          ssend(data->firstsocket, data, "\r\n", 2);
         }
-    if(0 == *bytecount) {
+        sendf(data->firstsocket, data,
+              "\r\n"
+              "%s\r\n",
+              data->postfields );
+      }
+      else
+        sendf(data->firstsocket, data, "\r\n");
+
       /* HTTP GET/HEAD download: */
-      result = Transfer(data, data->firstsocket, -1, TRUE, bytecount,
+      result = Transfer(conn, data->firstsocket, -1, TRUE, bytecount,
                         -1, NULL); /* nothing to upload */
     }
     if(result)
       return result;
-
-#if 0      
-    ProgressEnd(data);
-#endif
-    pgrsDone(data);
-
   } while (0); /* this is just a left-over from the multiple document download
                   attempts */
 
-  return URG_OK;
+  return CURLE_OK;
 }
 

lib/http.h

@@ -27,9 +27,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,6 +40,12 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError http(struct UrlData *data, char *path, char *host, long *bytecountp);
+
+/* protocol-specific functions set up to be called by the main engine */
+
+CURLcode http(struct connectdata *conn);
+CURLcode http_done(struct connectdata *conn);
+CURLcode http_connect(struct connectdata *conn);
+CURLcode http_close(struct connectdata *conn);
 
 #endif

lib/if2ip.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,11 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "setup.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -50,12 +51,24 @@
 
 #if ! defined(WIN32) && ! defined(__BEOS__)
 
+#ifdef NEED_REENTRANT
+#define _REENTRANT
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#include <netinet/in.h>
+
+#ifdef HAVE_SYS_TIME_H
+/* This must be before net/if.h for AIX 3.2 to enjoy life */
+#include <sys/time.h>
+#endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
@@ -70,9 +83,13 @@
 #include <sys/sockio.h>
 #endif
 
+#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL) 
+#include "inet_ntoa_r.h"
+#endif
+
 #define SYS_ERROR -1
 
-char *if2ip(char *interface)
+char *if2ip(char *interface, char *buf, int buf_size)
 {
   int dummy;
   char *ip=NULL;
@@ -97,7 +114,12 @@ char *if2ip(char *interface)
 
       struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;
       memcpy(&in, &(s->sin_addr.s_addr), sizeof(in));
-      ip = (char *)strdup(inet_ntoa(in));
+#if defined(HAVE_INET_NTOA_R)
+      ip = inet_ntoa_r(in,buf,buf_size);
+#else
+      ip = strncpy(buf,inet_ntoa(in),buf_size);
+      ip[buf_size - 1] = 0;
+#endif
     }
     close(dummy);
   }

lib/if2ip.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -42,9 +42,9 @@
 #include "setup.h"
 
 #if ! defined(WIN32) && ! defined(__BEOS__)
-char *if2ip(char *interface);
+extern char *if2ip(char *interface, char *buf, int buf_size);
 #else
-#define if2ip(x) NULL
+#define if2ip(a,b,c) NULL
 #endif
 
 #endif

lib/inet_ntoa_r.h

@@ -0,0 +1,9 @@
+#ifndef __INET_NTOA_R_H
+#define __INET_NTOA_R_H
+/*
+ * My solaris 5.6 system running gcc 2.8.1 does *not* have this prototype
+ * in any system include file! Isn't that weird?
+ */
+char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
+
+#endif

lib/ldap.c

@@ -26,7 +26,7 @@
  * Contributor(s):
  *  Bj<42>rn Reese <breese@mail1.stofanet.dk>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -48,8 +50,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__)
 #else
 # ifdef HAVE_UNISTD_H
@@ -72,7 +72,7 @@
 #define DYNA_GET_FUNCTION(type, fnc) \
   (fnc) = (type)DynaGetFunction(#fnc); \
   if ((fnc) == NULL) { \
-    return URG_FUNCTION_NOT_FOUND; \
+    return CURLE_FUNCTION_NOT_FOUND; \
   } \
 
 /***********************************************************************
@@ -89,7 +89,18 @@ static void DynaOpen(void)
      * liblber.so automatically, but since it does not we will
      * handle it here by opening liblber.so as global.
      */
-    dlopen("liblber.so", RTLD_LAZY | RTLD_GLOBAL);
+    dlopen("liblber.so",
+#ifdef RTLD_LAZY_GLOBAL /* It turns out some systems use this: */
+           RTLD_LAZY_GLOBAL
+#else
+#ifdef RTLD_GLOBAL
+           RTLD_LAZY | RTLD_GLOBAL
+#else
+           /* and some systems don't have the RTLD_GLOBAL symbol */
+           RTLD_LAZY
+#endif
+#endif
+           );
     libldap = dlopen("libldap.so", RTLD_LAZY);
   }
 #endif
@@ -124,15 +135,20 @@ static int WriteProc(void *param, char *text, int len)
 {
   struct UrlData *data = (struct UrlData *)param;
 
-  printf("%s\n", text);
+  data->fwrite(text, 1, strlen(text), data->out);
   return 0;
 }
 
+CURLcode ldap_done(struct connectdata *conn)
+{
+  return CURLE_OK;
+}
+
 /***********************************************************************
  */
-UrgError ldap(struct UrlData *data, char *path, long *bytecount)
+CURLcode ldap(struct connectdata *conn)
 {
-  UrgError status = URG_OK;
+  CURLcode status = CURLE_OK;
   int rc;
   void *(*ldap_open)(char *, int);
   int (*ldap_simple_bind_s)(void *, char *, char *);
@@ -146,24 +162,19 @@ UrgError ldap(struct UrlData *data, char *path, long *bytecount)
   void *server;
   void *result;
   void *entryIterator;
-#if 0
-  char *dn;
-  char **attrArray;
-  char *attrIterator;
-  char *attrString;
-  void *dummy;
-#endif
+
   int ldaptext;
+  struct UrlData *data=conn->data;
   
   infof(data, "LDAP: %s %s\n", data->url);
 
   DynaOpen();
   if (libldap == NULL) {
     failf(data, "The needed LDAP library/libraries couldn't be opened");
-    return URG_LIBRARY_NOT_FOUND;
+    return CURLE_LIBRARY_NOT_FOUND;
   }
 
-  ldaptext = data->conf & CONF_FTPASCII; /* This is a dirty hack */
+  ldaptext = data->bits.ftp_ascii; /* This is a dirty hack */
   
   /* The types are needed because ANSI C distinguishes between
    * pointer-to-object (data) and pointer-to-function.
@@ -182,17 +193,17 @@ UrgError ldap(struct UrlData *data, char *path, long *bytecount)
   if (server == NULL) {
     failf(data, "LDAP: Cannot connect to %s:%d",
 	  data->hostname, data->port);
-    status = URG_COULDNT_CONNECT;
+    status = CURLE_COULDNT_CONNECT;
   } else {
     rc = ldap_simple_bind_s(server, data->user, data->passwd);
     if (rc != 0) {
       failf(data, "LDAP: %s", ldap_err2string(rc));
-      status = URG_LDAP_CANNOT_BIND;
+      status = CURLE_LDAP_CANNOT_BIND;
     } else {
       rc = ldap_url_search_s(server, data->url, 0, &result);
       if (rc != 0) {
 	failf(data, "LDAP: %s", ldap_err2string(rc));
-	status = URG_LDAP_SEARCH_FAILED;
+	status = CURLE_LDAP_SEARCH_FAILED;
       } else {
 	for (entryIterator = ldap_first_entry(server, result);
 	     entryIterator;
@@ -204,7 +215,7 @@ UrgError ldap(struct UrlData *data, char *path, long *bytecount)
 				   "", 0, 0);
 	      if (rc != 0) {
 		failf(data, "LDAP: %s", ldap_err2string(rc));
-		status = URG_LDAP_SEARCH_FAILED;
+		status = CURLE_LDAP_SEARCH_FAILED;
 	      }
 	    } else {
 	      rc = ldap_entry2html(server, NULL, entryIterator, NULL,
@@ -212,7 +223,7 @@ UrgError ldap(struct UrlData *data, char *path, long *bytecount)
 				   "", 0, 0, NULL, NULL);
 	      if (rc != 0) {
 		failf(data, "LDAP: %s", ldap_err2string(rc));
-		status = URG_LDAP_SEARCH_FAILED;
+		status = CURLE_LDAP_SEARCH_FAILED;
 	      }
 	    }
 	  }

lib/ldap.h

@@ -27,7 +27,7 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
  * 	http://www.fts.frontec.se/~dast/curl/
  *
@@ -40,6 +40,7 @@
  *
  * ------------------------------------------------------------
  ****************************************************************************/
-UrgError ldap(struct UrlData *data, char *path, long *bytecount);
+CURLcode ldap(struct connectdata *conn);
+CURLcode ldap_done(struct connectdata *conn);
 
 #endif /* __LDAP_H */

lib/netrc.c

@@ -28,17 +28,17 @@
  *   Linas Vepstas <linas@linas.org>
  *   Bjorn Reese <breese@imada.ou.dk>
  *   Johan Anderson <johan@homemail.com>
- *   Kjell Ericson <Kjell.Ericson@haxx.nu>
+ *   Kjell Ericson <Kjell.Ericson@haxx.se>
  *   Troy Engel <tengel@palladium.net>
  *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
+ *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
  *   Angus Mackay <amackay@gus.ml.org>
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -50,12 +50,14 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "setup.h"
 #include "getenv.h"
+#include "strequal.h"
 
 /* Debug this single source file with:
    'make netrc' then run './netrc'!
@@ -94,9 +96,14 @@ int ParseNetrc(char *host,
 
 #define NETRC DOT_CHAR "netrc"
 
-  if(!home || (strlen(home)>(sizeof(netrcbuffer)-strlen(NETRC))))
+  if(!home)
     return -1;
 
+  if(strlen(home)>(sizeof(netrcbuffer)-strlen(NETRC))) {
+    free(home);
+    return -1;
+  }
+
   sprintf(netrcbuffer, "%s%s%s", home, DIR_CHAR, NETRC);
 
   file = fopen(netrcbuffer, "r");
@@ -161,6 +168,8 @@ int ParseNetrc(char *host,
     fclose(file);
   }
 
+  free(home);
+
   return retcode;
 }
 

lib/netrc.h

@@ -30,17 +30,17 @@
  *   Linas Vepstas <linas@linas.org>
  *   Bjorn Reese <breese@imada.ou.dk>
  *   Johan Anderson <johan@homemail.com>
- *   Kjell Ericson <Kjell.Ericson@haxx.nu>
+ *   Kjell Ericson <Kjell.Ericson@haxx.se>
  *   Troy Engel <tengel@palladium.net>
  *   Ryan Nelson <ryan@inch.com>
- *   Bjorn Stenberg <Bjorn.Stenberg@haxx.nu>
+ *   Bjorn Stenberg <Bjorn.Stenberg@haxx.se>
  *   Angus Mackay <amackay@gus.ml.org>
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -51,7 +51,10 @@
  *
  * ------------------------------------------------------------
  * $Log$
- * Revision 1.2  2000-01-10 23:36:15  bagder
+ * Revision 1.3  2000-06-20 15:31:26  bagder
+ * haxx.nu => haxx.se
+ *
+ * Revision 1.2  2000/01/10 23:36:15  bagder
  * syncing with local edit
  *
  * Revision 1.3  1999/09/06 06:59:41  dast

lib/progress.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,9 +38,10 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-#include <string.h>
 #include "setup.h"
 
+#include <string.h>
+
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #if defined(__MINGW32__)
 #include <winsock.h>
@@ -57,6 +58,7 @@
 
 #include <curl/curl.h>
 #include "urldata.h"
+#include "sendf.h"
 
 #include "progress.h"
 
@@ -72,15 +74,23 @@ void time2str(char *r, int t)
    but never longer than 5 columns. Add suffix k, M, G when suitable... */
 char *max5data(double bytes, char *max5)
 {
+#define ONE_KILOBYTE 1024
+#define ONE_MEGABYTE (1024*1024)
+
   if(bytes < 100000) {
     sprintf(max5, "%5d", (int)bytes);
     return max5;
   }
-  if(bytes < (9999*1024)) {
-    sprintf(max5, "%4dk", (int)bytes/1024);
+  if(bytes < (9999*ONE_KILOBYTE)) {
+    sprintf(max5, "%4dk", (int)bytes/ONE_KILOBYTE);
     return max5;
   }
-  sprintf(max5, "%4dM", (int)bytes/(1024*1024));
+  if(bytes < (100*ONE_MEGABYTE)) {
+    /* 'XX.XM' is good as long as we're less than 100 megs */
+    sprintf(max5, "%2.1fM", bytes/ONE_MEGABYTE);
+    return max5;
+  }
+  sprintf(max5, "%4dM", (int)bytes/ONE_MEGABYTE);
   return max5;
 }
 
@@ -89,7 +99,6 @@ char *max5data(double bytes, char *max5)
    New proposed interface, 9th of February 2000:
 
    pgrsStartNow() - sets start time
-   pgrsMode(type) - kind of display
    pgrsSetDownloadSize(x) - known expected download size
    pgrsSetUploadSize(x) - known expected upload size
    pgrsSetDownloadCounter() - amount of data currently downloaded
@@ -98,7 +107,7 @@ char *max5data(double bytes, char *max5)
    pgrsDone() - transfer complete
 
 */
-#if 1
+
 void pgrsDone(struct UrlData *data)
 {
   if(!(data->progress.flags & PGRS_HIDE)) {
@@ -107,16 +116,6 @@ void pgrsDone(struct UrlData *data)
     fprintf(stderr, "\n");
   }
 }
-void pgrsMode(struct UrlData *data, int mode)
-{
-  /* mode should include a hidden mode as well */
-  if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
-    data->progress.flags |= PGRS_HIDE; /* don't show anything */
-  else {
-    data->progress.mode = mode; /* store type */
-  }
-
-}
 
 void pgrsTime(struct UrlData *data, timerid timer)
 {
@@ -179,29 +178,11 @@ void pgrsSetUploadSize(struct UrlData *data, double size)
 
  */
 
-void pgrsUpdate(struct UrlData *data)
+int pgrsUpdate(struct UrlData *data)
 {
   struct timeval now;
+  int result;
 
-  if(data->progress.flags & PGRS_HIDE)
-    ; /* We do enter this function even if we don't wanna see anything, since
-         this is were lots of the calculations are being made that will be used
-         even when not displayed! */
-  else if(!(data->progress.flags & PGRS_HEADERS_OUT)) {
-    if ( data->progress.mode == CURL_PROGRESS_STATS ) {
-      fprintf(data->err,
-              "  %% Total    %% Received %% Xferd  Average Speed          Time             Curr.\n"
-              "                                 Dload  Upload Total    Current  Left    Speed\n");
-    }
-    data->progress.flags |= PGRS_HEADERS_OUT; /* headers are shown */
-  }
-
-  now = tvnow(); /* what time is it */
-
-  switch(data->progress.mode) {
-  case CURL_PROGRESS_STATS:
-  default:
-    {
   char max5[6][6];
   double dlpercen=0;
   double ulpercen=0;
@@ -228,8 +209,23 @@ void pgrsUpdate(struct UrlData *data)
   
   double total_estimate;
 
+  if(data->progress.flags & PGRS_HIDE)
+    ; /* We do enter this function even if we don't wanna see anything, since
+         this is were lots of the calculations are being made that will be used
+         even when not displayed! */
+  else if(!(data->progress.flags & PGRS_HEADERS_OUT)) {
+    if (!data->progress.callback) {
+      fprintf(data->err,
+              "  %% Total    %% Received %% Xferd  Average Speed          Time             Curr.\n"
+              "                                 Dload  Upload Total    Current  Left    Speed\n");
+    }
+    data->progress.flags |= PGRS_HEADERS_OUT; /* headers are shown */
+  }
+
+  now = tvnow(); /* what time is it */
+
   if(data->progress.lastshow == tvlong(now))
-        return; /* never update this more than once a second if the end isn't 
+    return 0; /* never update this more than once a second if the end isn't 
                  reached */
   data->progress.lastshow = now.tv_sec;
 
@@ -256,7 +252,17 @@ void pgrsUpdate(struct UrlData *data)
     (speeder[nowindex]-speeder[checkindex])/(count?count:1);
 
   if(data->progress.flags & PGRS_HIDE)
-        return;
+    return 0;
+  else if(data->fprogress) {
+    result= data->fprogress(data->progress_client,
+                            data->progress.size_dl,
+                            data->progress.downloaded,
+                            data->progress.size_ul,
+                            data->progress.uploaded);
+    if(result)
+      failf(data, "Callback aborted");
+    return result;
+  }
 
       /* Figure out the estimated time of arrival for the upload */
   if(data->progress.flags & PGRS_UL_SIZE_KNOWN) {
@@ -306,7 +312,6 @@ void pgrsUpdate(struct UrlData *data)
   if(total_expected_transfer)
     total_percen=(double)(total_transfer/total_expected_transfer)*100;
 
-
   fprintf(stderr,
           "\r%3d %s  %3d %s  %3d %s  %s  %s %s %s %s %s",
           (int)total_percen,                            /* total % */
@@ -323,227 +328,6 @@ void pgrsUpdate(struct UrlData *data)
           time_left,                            /* time left */
           max5data(data->progress.current_speed, max5[5]) /* current speed */
           );
-    }
-    break;
-#if 0
-  case CURL_PROGRESS_BAR:
-    /* original progress bar code by Lars Aas */
-    if (progressmax == -1) {
-      int prevblock = prev / 1024;
-      int thisblock = point / 1024;
-      while ( thisblock > prevblock ) {
-        fprintf( data->err, "#" );
-        prevblock++;
-      }
-        prev = point;
-    }
-    else {
-      char line[256];
-      char outline[256];
-      char format[40];
-      float frac = (float) point / (float) progressmax;
-      float percent = frac * 100.0f;
-      int barwidth = width - 7;
-      int num = (int) (((float)barwidth) * frac);
-        int i = 0;
-        for ( i = 0; i < num; i++ ) {
-          line[i] = '#';
-        }
-        line[i] = '\0';
-        sprintf( format, "%%-%ds %%5.1f%%%%", barwidth );
-        sprintf( outline, format, line, percent );
-        fprintf( data->err, "\r%s", outline );
-    }
-    prev = point;
-    break;
-#endif
-  }
+
+    return 0;
 }
-
-
-#endif
-
-#if 0
-/* --- start of (the former) progress routines --- */
-int progressmax=-1;
-
-static int prev = 0;
-static int width = 0;
-
-void ProgressInit(struct UrlData *data, int max/*, int options, int moremax*/)
-{
-#ifdef __EMX__
-  /* 20000318 mgs */
-  int scr_size [2];
-#endif
-
-  if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
-    return;
-
-  prev = 0;
-
-/* TODO: get terminal width through ansi escapes or something similar.
-         try to update width when xterm is resized... - 19990617 larsa */
-#ifndef __EMX__
-  /* 20000318 mgs
-   * OS/2 users most likely won't have this env var set, and besides that
-   * we're using our own way to determine screen width */
-  if (curl_GetEnv("COLUMNS") != NULL)
-    width = atoi(curl_GetEnv("COLUMNS"));
-  else
-    width = 79;
-#else
-  /* 20000318 mgs
-   * We use this emx library call to get the screen width, and subtract
-   * one from what we got in order to avoid a problem with the cursor
-   * advancing to the next line if we print a string that is as long as
-   * the screen is wide. */
- 
-  _scrsize(scr_size);
-  width = scr_size[0] - 1;
-#endif
-
-
-  progressmax = max;
-  if(-1 == max)
-    return;
-  if(progressmax <= LEAST_SIZE_PROGRESS) {
-    progressmax = -1; /* disable */
-    return;
-  }
-
-  if ( data->progressmode == CURL_PROGRESS_STATS )
-    fprintf(data->err,
-            "  %%   Received    Total    Speed  Estimated   Time      Left   Curr.Speed\n");
-
-}
-
-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;
-
-      double spent;
-      double speed;
-
-#define CURR_TIME 5
-
-      static int speeder[ CURR_TIME ];
-      static int speeder_c=0;
-
-      int nowindex = speeder_c% CURR_TIME;
-      int checkindex;
-      int count;
-
-      if(!force && (point != progressmax) && (lastshow == tvlong(now)))
-        return; /* never update this more than once a second if the end isn't 
-                   reached */
-
-      spent = tvdiff (now, start);
-      speed = point/(spent!=0.0?spent:1.0);
-      if(!speed)
-        speed=1;
-
-      /* point is where we are right now */
-      speeder[ nowindex ] = point;
-      speeder_c++; /* increase */
-      count = ((speeder_c>=CURR_TIME)?CURR_TIME:speeder_c) - 1;
-      checkindex = (speeder_c>=CURR_TIME)?speeder_c%CURR_TIME:0;
-
-      /* find out the average speed the last CURR_TIME seconds */
-      data->current_speed = (speeder[nowindex]-speeder[checkindex])/(count?count:1);
-
-#if 0
-      printf("NOW %d(%d) THEN %d(%d) DIFF %lf COUNT %d\n",
-	     speeder[nowindex], nowindex,
-	     speeder[checkindex], checkindex,
-	     data->current_speed, count);
-#endif
-
-      if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
-        return;
-
-      if(-1 != progressmax) {
-        char left[20];
-        char estim[20];
-        char timespent[20];
-        int estimate = progressmax/(int) speed;
-    
-        time2str(left,estimate-(int) spent); 
-        time2str(estim,estimate);
-        time2str(timespent,spent);
-
-        percen=(double)point/progressmax;
-        percen=percen*100;
-
-        fprintf(stderr, "\r%3d %10d %10d %6.0lf %s %s %s %6.0lf   ",
-                (int)percen, point, progressmax,
-                speed, estim, timespent, left, data->current_speed);
-      }
-      else
-        fprintf(data->err,
-                "\r%d bytes received in %.3lf seconds (%.0lf bytes/sec)",
-                point, spent, speed);
-
-      lastshow = now.tv_sec;
-      break;
-    }
-  case CURL_PROGRESS_BAR: /* 19990617 larsa */
-    {
-      if (point == prev) break;
-      if (progressmax == -1) {
-        int prevblock = prev / 1024;
-        int thisblock = point / 1024;
-        while ( thisblock > prevblock ) {
-            fprintf( data->err, "#" );
-            prevblock++;
-        }
-        prev = point;
-      } else {
-        char line[256];
-        char outline[256];
-        char format[40];
-        float frac = (float) point / (float) progressmax;
-        float percent = frac * 100.0f;
-        int barwidth = width - 7;
-        int num = (int) (((float)barwidth) * frac);
-        int i = 0;
-        for ( i = 0; i < num; i++ ) {
-            line[i] = '#';
-        }
-        line[i] = '\0';
-        sprintf( format, "%%-%ds %%5.1f%%%%", barwidth );
-        sprintf( outline, format, line, percent );
-        fprintf( data->err, "\r%s", outline );
-      }
-      prev = point;
-      break;
-    }
-  default: /* 19990617 larsa */
-    {
-      int prevblock = prev / 1024;
-      int thisblock = point / 1024;
-      if (prev == point) break;
-      while ( thisblock > prevblock ) {
-        fprintf( data->err, "#" );
-        prevblock++;
-      }
-      prev = point;
-      break;
-    }
-  }
-}
-
-void ProgressEnd(struct UrlData *data)
-{
-  if(data->conf&(CONF_NOPROGRESS|CONF_MUTE))
-    return;
-  fputs("\n", data->err);
-}
-
-/* --- end of progress routines --- */
-#endif

lib/progress.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -42,21 +42,24 @@
 
 #include "timeval.h"
 
-#if 0
-void ProgressInit(struct UrlData *data, int max);
-void ProgressShow(struct UrlData *data,
-                  int point, struct timeval start, struct timeval now, bool force);
-void ProgressEnd(struct UrlData *data);
-void ProgressMode(int mode);
-#endif
 
-void pgrsMode(struct UrlData *data, int mode);
+typedef enum {
+  TIMER_NONE,
+  TIMER_NAMELOOKUP,
+  TIMER_CONNECT,
+  TIMER_PRETRANSFER,
+  TIMER_POSTRANSFER,
+  TIMER_LAST /* must be last */
+} timerid;
+  
+void pgrsDone(struct UrlData *data);
 void pgrsStartNow(struct UrlData *data);
 void pgrsSetDownloadSize(struct UrlData *data, double size);
 void pgrsSetUploadSize(struct UrlData *data, double size);
 void pgrsSetDownloadCounter(struct UrlData *data, double size);
-     void pgrsSetUploadCounter(struct UrlData *data, double size);
-void pgrsUpdate(struct UrlData *data);
+void pgrsSetUploadCounter(struct UrlData *data, double size);
+int pgrsUpdate(struct UrlData *data);
+void pgrsTime(struct UrlData *data, timerid timer);
 
 
 /* Don't show progress for sizes smaller than: */
@@ -77,14 +80,4 @@ void pgrsUpdate(struct UrlData *data);
 #define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
 
 
-typedef enum {
-  TIMER_NONE,
-  TIMER_NAMELOOKUP,
-  TIMER_CONNECT,
-  TIMER_PRETRANSFER,
-  TIMER_POSTRANSFER,
-  TIMER_LAST /* must be last */
-} timerid;
-  
-
 #endif /* __PROGRESS_H */

lib/sendf.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,12 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "setup.h"
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -61,7 +61,7 @@
 void infof(struct UrlData *data, char *fmt, ...)
 {
   va_list ap;
-  if(data->conf & CONF_VERBOSE) {
+  if(data->bits.verbose) {
     va_start(ap, fmt);
     fputs("* ", data->err);
     vfprintf(data->err, fmt, ap);
@@ -84,7 +84,6 @@ void failf(struct UrlData *data, char *fmt, ...)
 }
 
 /* sendf() sends the formated data to the server */
-
 int sendf(int fd, struct UrlData *data, char *fmt, ...)
 {
   size_t bytes_written;
@@ -95,7 +94,7 @@ int sendf(int fd, struct UrlData *data, char *fmt, ...)
   va_end(ap);
   if(!s)
     return 0; /* failure */
-  if(data->conf & CONF_VERBOSE)
+  if(data->bits.verbose)
     fprintf(data->err, "> %s", s);
 #ifndef USE_SSLEAY
    bytes_written = swrite(fd, s, strlen(s));
@@ -110,6 +109,25 @@ int sendf(int fd, struct UrlData *data, char *fmt, ...)
   return(bytes_written);
 }
 
+/* ssend() sends plain (binary) data to the server */
+size_t ssend(int fd, struct UrlData *data, void *mem, size_t len)
+{
+  size_t bytes_written;
+
+  if(data->bits.verbose)
+    fprintf(data->err, "> [binary output]\n");
+#ifndef USE_SSLEAY
+   bytes_written = swrite(fd, mem, len);
+#else
+  if (data->use_ssl) {
+    bytes_written = SSL_write(data->ssl, mem, len);
+  } else {
+    bytes_written = swrite(fd, mem, len);
+  }
+#endif /* USE_SSLEAY */
+  return bytes_written;
+}
+
 
 
 

lib/sendf.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,7 +40,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-int sendf(int fd, struct UrlData *, char *fmt, ...);
+size_t sendf(int fd, struct UrlData *, char *fmt, ...);
+size_t ssend(int fd, struct UrlData *, void *fmt, size_t len);
 void infof(struct UrlData *, char *fmt, ...);
 void failf(struct UrlData *, char *fmt, ...);
 

lib/setup.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -40,7 +40,7 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-#include <stdio.h>
+
 
 #if !defined(WIN32) && defined(_WIN32)
 /* This _might_ be a good Borland fix. Please report whether this works or
@@ -57,8 +57,7 @@
 #endif
 #endif
 
-
-
+#include <stdio.h>
 #ifndef OS
 #ifdef WIN32
 #define OS "win32"
@@ -99,6 +98,7 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
 #endif
 #endif
 
+#if 0
 #ifdef HAVE_STRCASECMP
 #define strnequal(x,y,z) !(strncasecmp)(x,y,z)
 #define strequal(x,y) !(strcasecmp)(x,y)
@@ -107,6 +107,7 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO)
 #define strnequal(x,y,z) !strnicmp(x,y,z)
 #define strequal(x,y) !stricmp(x,y)
 #endif
+#endif
 
 /* Below we define four functions. They should
    1. close a socket

lib/speedcheck.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #if defined(__MINGW32__)
 #include <winsock.h>
@@ -48,7 +50,7 @@
 #include "sendf.h"
 #include "speedcheck.h"
 
-UrgError speedcheck(struct UrlData *data,
+CURLcode speedcheck(struct UrlData *data,
                     struct timeval now)
 {
   static struct timeval keeps_speed;
@@ -69,13 +71,13 @@ UrgError speedcheck(struct UrlData *data,
 	    "Less than %d bytes/sec transfered the last %d seconds",
 	    data->low_speed_limit,
 	    data->low_speed_time);
-      return URG_OPERATION_TIMEOUTED;
+      return CURLE_OPERATION_TIMEOUTED;
     }
   }
   else {
     /* we keep up the required speed all right */
     keeps_speed = now;
   }
-  return URG_OK;
+  return CURLE_OK;
 }
 

lib/speedcheck.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -44,7 +44,7 @@
 
 #include "timeval.h"
 
-UrgError speedcheck(struct UrlData *data,
+CURLcode speedcheck(struct UrlData *data,
                     struct timeval now);
 
 #endif

lib/ssluse.c

@@ -24,9 +24,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$
@@ -38,6 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+/*
+ * The original SSL code was written by
+ * Linas Vepstas <linas@linas.org> and Sampo Kellomaki <sampo@iki.fi>
+ */
+
+#include "setup.h"
 #include <string.h>
 #include <stdlib.h>
 

lib/ssluse.h

@@ -26,9 +26,9 @@
  *
  * ------------------------------------------------------------
  * Main author:
- * - Daniel Stenberg <Daniel.Stenberg@haxx.nu>
+ * - Daniel Stenberg <daniel@haxx.se>
  *
- * 	http://curl.haxx.nu
+ * 	http://curl.haxx.se
  *
  * $Source$
  * $Revision$

lib/strequal.c

@@ -0,0 +1,85 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 2000.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <daniel@haxx.se>
+ *
+ * 	http://curl.haxx.se
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+
+int strequal(const char *first, const char *second)
+{
+#if defined(HAVE_STRCASECMP)
+  return !strcasecmp(first, second);
+#elif defined(HAVE_STRCMPI)
+  return !strcmpi(first, second);
+#elif defined(HAVE_STRICMP)
+  return !stricmp(first, second);
+#else
+  while (*first && *second) {
+    if (toupper(*first) != toupper(*second)) {
+      break;
+    }
+    first++;
+    second++;
+  }
+  return toupper(*first) == toupper(*second);
+#endif
+}
+
+int strnequal(const char *first, const char *second, size_t max)
+{
+#if defined(HAVE_STRCASECMP)
+  return !strncasecmp(first, second, max);
+#elif defined(HAVE_STRCMPI)
+  return !strncmpi(first, second, max);
+#elif defined(HAVE_STRICMP)
+  return !strnicmp(first, second, max);
+#else
+  while (*first && *second && max) {
+    if (toupper(*first) != toupper(*second)) {
+      break;
+    }
+    max--;
+    first++;
+    second++;
+  }
+  return toupper(*first) == toupper(*second);
+#endif
+}
+

lib/strequal.h

@@ -0,0 +1,45 @@
+#ifndef __STREQUAL_H
+#define __STREQUAL_H
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ *  The contents of this file are subject to the Mozilla Public License
+ *  Version 1.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *  http://www.mozilla.org/MPL/
+ *
+ *  Software distributed under the License is distributed on an "AS IS"
+ *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing rights and limitations
+ *  under the License.
+ *
+ *  The Original Code is Curl.
+ *
+ *  The Initial Developer of the Original Code is Daniel Stenberg.
+ *
+ *  Portions created by the Initial Developer are Copyright (C) 2000.
+ *  All Rights Reserved.
+ *
+ * ------------------------------------------------------------
+ * Main author:
+ * - Daniel Stenberg <daniel@haxx.se>
+ *
+ * 	http://curl.haxx.se
+ *
+ * $Source$
+ * $Revision$
+ * $Date$
+ * $Author$
+ * $State$
+ * $Locker$
+ *
+ * ------------------------------------------------------------
+ ****************************************************************************/
+int strequal(const char *first, const char *second);
+int strnequal(const char *first, const char *second, size_t max);
+
+#endif