[svn] Applied Philipp Thomas's safe-ctype patch. Published in

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 97be28b5414cc6d0bbd890c10d8d5b6df9f6750a..32ff0364b7308cddead6b1847bcd00b205cf1cce 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,5 +1,5 @@
 /* Dirty system-dependent hacks.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of Wget.
 
@@ -45,15 +45,29 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <mswindows.h>
 #endif /* WINDOWS */
 
-/* Allegedly needed for compilation under OS/2: */
-#ifdef EMXOS2
+/* 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__ */
+
+/* Needed for compilation under OS/2: */
+#ifdef __EMX__
 #ifndef S_ISLNK
 # define S_ISLNK(m) 0
 #endif
 #ifndef lstat
 # define lstat stat
 #endif
-#endif /* EMXOS2 */
+#endif /* __EMX__ */
 
 /* Reportedly, stat() macros are broken on some old systems.  Those
    systems will have to fend for themselves, as I will not introduce
@@ -97,22 +111,19 @@ do {                                               \
   DEBUGP (("Closing fd %d\n", x));             \
 } while (0)
 
-/* OK, now define a decent interface to ctype macros.  The regular
-   ones misfire when you feed them chars >= 127, as they understand
-   them as "negative", which results in out-of-bound access at
-   table-lookup, yielding random results.  This is, of course, totally
-   bogus.  One way to "solve" this is to use `unsigned char'
-   everywhere, but it is nearly impossible to do that cleanly, because
-   all of the library functions and system calls accept `char'.
-
-   Thus we define our wrapper macros which simply cast the argument to
-   unsigned char before passing it to the <ctype.h> macro.  These
-   versions are used consistently across the code.  */
-#define ISASCII(x)  isascii ((unsigned char)(x))
-#define ISALPHA(x)  isalpha ((unsigned char)(x))
-#define ISSPACE(x)  isspace ((unsigned char)(x))
-#define ISDIGIT(x)  isdigit ((unsigned char)(x))
-#define ISXDIGIT(x) isxdigit ((unsigned char)(x))
+/* Define a "very long" type useful for storing large non-negative
+   integers, e.g. the total number of bytes downloaded.  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.  Otherwise, we give up and
+   just use `long'.  */
+#if (SIZEOF_LONG >= 8) || !defined(HAVE_LONG_LONG)
+# define VERY_LONG_TYPE   unsigned long
+# define VERY_LONG_FORMAT "%lu"
+#else  /* long is smaller than 8 bytes, but long long is available. */
+# define VERY_LONG_TYPE   unsigned long long
+# define VERY_LONG_FORMAT "%llu"
+#endif /* use long long */
 
 /* Defined in cmpt.c: */
 #ifndef HAVE_STRERROR
@@ -130,6 +141,9 @@ char *strstr ();
 #ifndef HAVE_STRPTIME
 char *strptime ();
 #endif
+#ifndef HAVE_VSNPRINTF
+int vsnprintf ();
+#endif
 
 /* SunOS brain damage -- for some reason, SunOS header files fail to
    declare the functions below, which causes all kinds of problems