[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 1c5deb1b8290c293e59b69a6b3da24b571ecd77e..98b3c13bd8c6d1a0f5e3e725348e264099e59693 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,11 +1,11 @@
 /* Dirty system-dependent hacks.
 /* Dirty system-dependent hacks.

-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget 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 of the License, or (at
+the Free Software Foundation; either version 3 of the License, or (at

 your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,17 @@ 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
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */

 
 /* This file is included by wget.h.  Random .c files need not include
    it.  */
 
 /* This file is included by wget.h.  Random .c files need not include
    it.  */


@@ -23,50 +32,51 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef SYSDEP_H
 #define SYSDEP_H
 
 #ifndef SYSDEP_H
 #define SYSDEP_H
 

-/* We need these to be playing with various stuff.  */
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else /* not TIME_WITH_SYS_TIME_H */
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#else /* not HAVE_SYS_TIME_H */
-# include <time.h>
-#endif /* HAVE_SYS_TIME_H */
-#endif /* TIME_WITH_SYS_TIME_H */
-
+/* Must include these, so we can test for the missing stat macros and
+   define them as necessary.  */

 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 

+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+

 #ifdef WINDOWS
 #ifdef WINDOWS

-/* Windows doesn't have some functions.  Include mswindows.h so we get
-   their declarations, as well as some additional declarations and
-   macros.  This must come first, so it can set things up.  */
-#include <mswindows.h>
-#endif /* WINDOWS */
-
-/* Watcom-specific stuff.  In practice this is probably specific to
-   Windows, although Watcom exists under other OS's too.  For that
-   reason, we keep this here.  */
-
-#ifdef __WATCOMC__
-/* Watcom has its own alloca() defined in malloc.h malloc.h needs to
-   be included in the sources to prevent 'undefined external' errors
-   at the link phase. */
-# include <malloc.h>
-/* io.h defines unlink() and chmod().  We put this here because it's
-   way too obscure to require all the .c files to observe.  */
-# include <io.h>
-#endif /* __WATCOMC__ */
+/* Windows doesn't have some functions normally found on Unix-like
+   systems, such as strcasecmp, strptime, etc.  Include mswindows.h so
+   we get the declarations for their replacements in mswindows.c, as
+   well as to pick up Windows-specific includes and constants.  To be
+   able to test for such features, the file must be included as early
+   as possible.  */
+# include "mswindows.h"
+#endif
+
+/* Provide support for C99-type boolean type "bool".  This blurb comes
+   straight from the Autoconf 2.59 manual. */
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# if ! HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+typedef unsigned char _Bool;
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif

 
 /* Needed for compilation under OS/2: */
 #ifdef __EMX__
 
 /* Needed for compilation under OS/2: */
 #ifdef __EMX__

-#ifndef S_ISLNK
-# define S_ISLNK(m) 0
-#endif
-#ifndef lstat
-# define lstat stat
-#endif
+# ifndef S_ISLNK
+#  define S_ISLNK(m) 0
+# endif
+# ifndef lstat
+#  define lstat stat
+# endif

 #endif /* __EMX__ */
 
 /* Reportedly, stat() macros are broken on some old systems.  Those
 #endif /* __EMX__ */
 
 /* Reportedly, stat() macros are broken on some old systems.  Those


@@ -74,7 +84,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    new code to handle it.
 
    However, I will add code for *missing* macros, and the following
    new code to handle it.
 
    However, I will add code for *missing* macros, and the following

-   are missing from many systems.  */
+   are reportedly missing from many systems.  */

 #ifndef S_ISLNK
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
 #ifndef S_ISLNK
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif


@@ -85,108 +95,52 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
 #endif
 
 # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
 #endif
 

-/* Bletch!  SPARC compiler doesn't define sparc (needed by
-   arpa/nameser.h) when in -Xc mode.  Luckily, it always defines
-   __sparc.  */
-#ifdef __sparc
-#ifndef sparc
-#define sparc
+/* These are needed so we can #define struct_stat to struct _stati64
+   under Windows. */
+#ifndef struct_stat
+# define struct_stat struct stat

 #endif
 #endif

+#ifndef struct_fstat
+# define struct_fstat struct stat

 #endif
 
 #endif
 

-#ifdef __BEOS__
-# undef READ
-# undef WRITE
-# define READ(fd, buf, cnt) recv((fd), (buf), (cnt), 0)
-# define WRITE(fd, buf, cnt) send((fd), (buf), (cnt), 0)
-#endif
+/* For CHAR_BIT, LONG_MAX, etc. */
+#include <limits.h>

 
 

-/* mswindows.h defines these.  */
-#ifndef READ
-# define READ(fd, buf, cnt) read ((fd), (buf), (cnt))
-#endif
-#ifndef WRITE
-# define WRITE(fd, buf, cnt) write ((fd), (buf), (cnt))
-#endif
-#ifndef REALCLOSE
-# define REALCLOSE(x) close (x)
+#ifndef CHAR_BIT
+# define CHAR_BIT 8

 #endif
 
 #endif
 

-#define CLOSE(x)                               \
-do {                                           \
-  REALCLOSE (x);                               \
-  DEBUGP (("Closing fd %d\n", x));             \
-} while (0)
-
-/* Define a large ("very long") type useful for storing large
-   non-negative quantities that exceed sizes of normal download, such
-   as the *total* number of bytes downloaded.  To fit today's needs,
-   this needs to be an integral type at least 64 bits wide.  On the
-   machines where `long' is 64-bit, we use long.  Otherwise, we check
-   whether `long long' is available and if yes, use that.  If long
-   long is unavailable, we give up and just use `long'.
-
-   This check could be smarter and moved to configure, which could
-   check for a bunch of non-standard types such as uint64_t.  But I
-   don't see the need for it -- the current test will work on all
-   modern architectures, and if it fails, nothing bad happens, we just
-   end up with long.
-
-   Note: you cannot use VERY_LONG_TYPE along with printf().  When you
-   need to print it, use very_long_to_string().  */
-
-#if (SIZEOF_LONG >= 8) || !defined(HAVE_LONG_LONG)
-/* either long is "big enough", or long long is unavailable which
-   leaves long as the only choice. */ 
-# define VERY_LONG_TYPE   unsigned long
-#else  /* use long long */
-/* long is smaller than 8 bytes, but long long is available. */
-# define VERY_LONG_TYPE   unsigned long long
-#endif /* use long long */
+/* From gnulib, simplified to assume a signed type. */
+#define TYPE_MAXIMUM(t) ((t) (~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))

 
 

-/* Defined in cmpt.c: */
-#ifndef HAVE_STRERROR
-char *strerror ();
-#endif
+/* These are defined in cmpt.c if missing, so we must declare
+   them.  */

 #ifndef HAVE_STRCASECMP
 int strcasecmp ();
 #endif
 #ifndef HAVE_STRNCASECMP
 int strncasecmp ();
 #endif
 #ifndef HAVE_STRCASECMP
 int strcasecmp ();
 #endif
 #ifndef HAVE_STRNCASECMP
 int strncasecmp ();
 #endif

-#ifndef HAVE_STRSTR
-char *strstr ();
-#endif

 #ifndef HAVE_STRPTIME
 char *strptime ();
 #endif
 #ifndef HAVE_STRPTIME
 char *strptime ();
 #endif

+#ifndef HAVE_TIMEGM
+# include <time.h>
+time_t timegm (struct tm *);
+#endif
+#ifndef HAVE_MEMRCHR
+void *memrchr (const void *, int, size_t);
+#endif
+
+/* These are defined in snprintf.c.  It would be nice to have an
+   snprintf.h, though.  */
+#ifndef HAVE_SNPRINTF
+int snprintf ();
+#endif

 #ifndef HAVE_VSNPRINTF
 int vsnprintf ();
 #endif
 #ifndef HAVE_VSNPRINTF
 int vsnprintf ();
 #endif

-#ifndef HAVE_USLEEP
-int usleep ();
-#endif
-
-/* SunOS brain damage -- for some reason, SunOS header files fail to
-   declare the functions below, which causes all kinds of problems
-   (compiling errors) with pointer arithmetic and similar.
-
-   This used to be only within `#ifdef STDC_HEADERS', but it got
-   tripped on other systems (AIX), thus causing havoc.  Fortunately,
-   SunOS appears to be the only system braindamaged that badly, so I
-   added an extra `#ifdef sun' guard.  */
-#ifndef STDC_HEADERS
-#ifdef sun
-#ifndef __cplusplus
-char *strstr ();
-char *strchr ();
-char *strrchr ();
-char *strtok ();
-char *strdup ();
-void *memcpy ();
-#endif /* not __cplusplus */
-#endif /* sun */
-#endif /* STDC_HEADERS */

 
 /* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't
    provide MAP_FAILED, a symbolic constant for the value returned by
 
 /* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't
    provide MAP_FAILED, a symbolic constant for the value returned by


@@ -198,25 +152,66 @@ void *memcpy ();
 # define MAP_FAILED ((void *) -1)
 #endif
 
 # define MAP_FAILED ((void *) -1)
 #endif
 

-/* Define wrapper macros for different MD5 routines. */
-#ifdef HAVE_MD5
+/* Enable system fnmatch only on systems where fnmatch.h is usable.
+   If the fnmatch on your system is buggy, undef this symbol and a
+   replacement implementation will be used instead.  */
+#ifdef HAVE_WORKING_FNMATCH_H
+# define SYSTEM_FNMATCH
+#endif
+
+#ifdef SYSTEM_FNMATCH
+# include <fnmatch.h>
+#else  /* not SYSTEM_FNMATCH */
+/* Define fnmatch flags.  Undef them first to avoid warnings in case
+   an evil library include chose to include system fnmatch.h.  */
+# undef FNM_PATHNAME
+# undef FNM_NOESCAPE
+# undef FNM_PERIOD
+# undef FNM_NOMATCH
+
+# define FNM_PATHNAME  (1 << 0) /* No wildcard can ever match `/'.  */
+# define FNM_NOESCAPE  (1 << 1) /* Backslashes don't quote special chars.  */
+# define FNM_PERIOD    (1 << 2) /* Leading `.' is matched only explicitly.  */
+# define FNM_NOMATCH   1
+
+int fnmatch (const char *, const char *, int);
+#endif
+
+/* Provide sig_atomic_t if the system doesn't.  */
+#ifndef HAVE_SIG_ATOMIC_T
+typedef int sig_atomic_t;
+#endif
+
+/* Provide uint32_t on the platforms that don't define it.  Although
+   most code should be agnostic about integer sizes, some code really
+   does need a 32-bit integral type.  Such code should use uint32_t.
+   (The exception is gnu-md5.[ch], which uses its own detection for
+   portability across platforms.)  */

 
 

-#ifdef HAVE_BUILTIN_MD5
-# include <gnu-md5.h>
-# define MD5_CONTEXT_TYPE struct md5_ctx
-# define MD5_INIT(ctx) md5_init_ctx (ctx)
-# define MD5_UPDATE(buffer, len, ctx) md5_process_bytes (buffer, len, ctx)
-# define MD5_FINISH(ctx, result) md5_finish_ctx (ctx, result)
+#ifndef HAVE_UINT32_T
+# if SIZEOF_INT == 4
+typedef unsigned int uint32_t;
+# else
+#  if SIZEOF_LONG == 4
+typedef unsigned long uint32_t;
+#  else
+#   if SIZEOF_SHORT == 4
+typedef unsigned short uint32_t;
+#   else
+ #error "Cannot determine a 32-bit unsigned integer type"
+#   endif
+#  endif
+# endif

 #endif
 
 #endif
 

-#ifdef HAVE_SOLARIS_MD5
-# include <md5.h>
-# define MD5_CONTEXT_TYPE MD5_CTX
-# define MD5_INIT(ctx) MD5Init (ctx)
-# define MD5_UPDATE(buffer, len, ctx) MD5Update (ctx, (unsigned char *)(buffer), len)
-# define MD5_FINISH(ctx, result) MD5Final ((unsigned char *)(result), ctx)
+/* If uintptr_t isn't defined, simply typedef it to unsigned long. */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long uintptr_t;

 #endif
 
 #endif
 

-#endif /* HAVE_MD5 */
+/* If intptr_t isn't defined, simply typedef it to long. */
+#ifndef HAVE_INTPTR_T
+typedef long intptr_t;
+#endif

 
 #endif /* SYSDEP_H */
 
 #endif /* SYSDEP_H */