NEWS: cite --start-pos

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 344fe822323514e1ecbea01d8342be53c6abb8f8..bd6b83bf3e011016f4758e3e70d880943ee4f946 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,11 +1,13 @@
 /* Dirty system-dependent hacks.
 /* Dirty system-dependent hacks.

-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 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,18 +16,18 @@ 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 /* 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.  */


@@ -33,12 +35,76 @@ so, delete this exception statement from your version.  */
 #ifndef SYSDEP_H
 #define SYSDEP_H
 
 #ifndef SYSDEP_H
 #define SYSDEP_H
 

+/* Testing for __sun is not enough because it's also defined on SunOS.  */
+#ifdef __sun
+# ifdef __SVR4
+#  define solaris
+# endif
+#endif
+
+#if defined(__INTERIX) && !defined(_ALL_SOURCE)
+# define _ALL_SOURCE
+#endif
+
+/* The "namespace tweaks" below attempt to set a friendly "compilation
+   environment" under popular operating systems.  Default compilation
+   environment often means that some functions that are "extensions"
+   are not declared -- `strptime' is one example.
+
+   But non-default environments can expose bugs in the system header
+   files, crippling compilation in _very_ non-obvious ways.  Because
+   of that, we define them only on well-tested architectures where we
+   know they will work.  */
+
+#undef NAMESPACE_TWEAKS
+
+#ifdef solaris
+# define NAMESPACE_TWEAKS
+#endif
+
+#if defined(__linux__) || defined(__GLIBC__)
+# define NAMESPACE_TWEAKS
+#endif
+
+#ifdef NAMESPACE_TWEAKS
+
+/* Request the "Unix 98 compilation environment". */
+#define _XOPEN_SOURCE 500
+
+#endif /* NAMESPACE_TWEAKS */
+
+
+/* Alloca declaration, based on recommendation in the Autoconf manual.
+   These have to be after the above namespace tweaks, but before any
+   non-preprocessor code.  */
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined WINDOWS
+# include <malloc.h>
+# ifndef alloca
+#  define alloca _alloca
+# endif
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#else
+# include <stddef.h>
+# ifdef  __cplusplus
+extern "C"
+# endif
+void *alloca (size_t);
+#endif
+

 /* 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>
 
 #ifdef HAVE_INTTYPES_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>
 
 #ifdef HAVE_INTTYPES_H

+  /* Compaq C V6.5-303 (dtk) on HP Tru64 UNIX V5.1B (Rev. 2650) needs: */
+# include <stdint.h>

 # include <inttypes.h>
 #endif
 
 # include <inttypes.h>
 #endif
 


@@ -49,36 +115,21 @@ so, delete this exception statement from your version.  */
    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.  */
    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>
+# include "mswindows.h"

 #endif
 
 #endif
 

-/* Provide support for C99-type boolean type "bool".  This blurb comes
-   straight from the Autoconf 2.59 manual. */
-#if HAVE_STDBOOL_H
+/* Provided by gnulib on systems that don't have it: */

 # include <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 and MSDOS */
+#if defined(__EMX__) || defined(MSDOS)

 # 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__ */
+#endif /* __EMX__ || MSDOS */

 
 /* Reportedly, stat() macros are broken on some old systems.  Those
    systems will have to fend for themselves, as I will not introduce
 
 /* Reportedly, stat() macros are broken on some old systems.  Those
    systems will have to fend for themselves, as I will not introduce


@@ -96,35 +147,6 @@ typedef unsigned char _Bool;
 # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
 #endif
 
 # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
 #endif
 

-/* Define a large integral type useful for storing large sizes that
-   exceed sizes of one download, such as when printing the sum of all
-   downloads.  Note that this has nothing to do with large file
-   support, which determines the wgint type.  This should be as large
-   as possible even on systems where when wgint is 32-bit; also,
-   unlike wgint, this can be a floating point type.
-
-   We use a 64-bit integral type where available, `double' otherwise.
-   It's hard to print LARGE_INT's portably, but fortunately it's
-   rarely needed.  */
-
-#if SIZEOF_LONG >= 8
-/* Long is large enough: use it.  */
-typedef long LARGE_INT;
-# define LARGE_INT_FMT "%ld"
-#elif SIZEOF_LONG_LONG >= 8
-/* Long long is large enough: use it.  */
-typedef long long LARGE_INT;
-# define LARGE_INT_FMT "%lld"
-#elif WINDOWS
-/* Use __int64 under Windows. */
-typedef __int64 LARGE_INT;
-# define LARGE_INT_FMT "%I64"
-#else
-/* Large integer type unavailable; fake it with `double'.  */
-typedef double LARGE_INT;
-# define LARGE_INT_FMT "%.0f"
-#endif
-

 /* These are needed so we can #define struct_stat to struct _stati64
    under Windows. */
 #ifndef struct_stat
 /* These are needed so we can #define struct_stat to struct _stati64
    under Windows. */
 #ifndef struct_stat


@@ -141,13 +163,8 @@ typedef double LARGE_INT;
 # define CHAR_BIT 8
 #endif
 
 # define CHAR_BIT 8
 #endif
 

-/* Used by wget.h to define SIZEOF_WGINT. */
-#ifndef LONG_MAX
-# define LONG_MAX ((long) ~((unsigned long)1 << (CHAR_BIT * sizeof (long) - 1)))
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX ((long long) ~((unsigned long long)1 << (CHAR_BIT * sizeof (long long) - 1)))
-#endif
+/* From gnulib, simplified to assume a signed type. */
+#define TYPE_MAXIMUM(t) ((t) (~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))

 
 /* These are defined in cmpt.c if missing, so we must declare
    them.  */
 
 /* These are defined in cmpt.c if missing, so we must declare
    them.  */


@@ -160,14 +177,22 @@ int strncasecmp ();
 #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
 
 /* These are defined in snprintf.c.  It would be nice to have an
    snprintf.h, though.  */
 #ifndef HAVE_SNPRINTF

-int snprintf ();
+int snprintf (char *str, size_t count, const char *fmt, ...);

 #endif
 #ifndef HAVE_VSNPRINTF
 #endif
 #ifndef HAVE_VSNPRINTF

-int vsnprintf ();
+#include <stdarg.h>
+int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);

 #endif
 
 /* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't
 #endif
 
 /* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't


@@ -180,19 +205,12 @@ int vsnprintf ();
 # define MAP_FAILED ((void *) -1)
 #endif
 
 # define MAP_FAILED ((void *) -1)
 #endif
 

-/* Enable system fnmatch only on systems where fnmatch.h is usable and
-   which are known to have a non-broken fnmatch implementation.
-   Currently those include glibc-based systems and Solaris.  One could
-   add more, but fnmatch is not that large, so it might be better to
-   play it safe.  */
+/* 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
 #ifdef HAVE_WORKING_FNMATCH_H

-# if defined __GLIBC__ && __GLIBC__ >= 2
-#  define SYSTEM_FNMATCH
-# endif
-# ifdef solaris
-#  define SYSTEM_FNMATCH
-# endif
-#endif /* HAVE_WORKING_FNMATCH_H */
+# define SYSTEM_FNMATCH
+#endif

 
 #ifdef SYSTEM_FNMATCH
 # include <fnmatch.h>
 
 #ifdef SYSTEM_FNMATCH
 # include <fnmatch.h>


@@ -209,8 +227,7 @@ int vsnprintf ();
 # define FNM_PERIOD    (1 << 2) /* Leading `.' is matched only explicitly.  */
 # define FNM_NOMATCH   1
 
 # define FNM_PERIOD    (1 << 2) /* Leading `.' is matched only explicitly.  */
 # define FNM_NOMATCH   1
 

-/* Declare the function minimally. */
-int fnmatch ();
+int fnmatch (const char *, const char *, int);

 #endif
 
 /* Provide sig_atomic_t if the system doesn't.  */
 #endif
 
 /* Provide sig_atomic_t if the system doesn't.  */


@@ -240,4 +257,14 @@ typedef unsigned short uint32_t;
 # endif
 #endif
 
 # endif
 #endif
 

+/* If uintptr_t isn't defined, simply typedef it to unsigned long. */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long uintptr_t;
+#endif
+
+/* 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 */