Updated config.guess, config.sub, install.sh.

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 431e9d70fe87c04c80a5d9456cf05ff821f55a5e..71687278d2ab718279bf8645a1520808474ef7df 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,12 +1,12 @@
 /* Declarations for windows
 /* Declarations for windows

-   Copyright (C) 1995, 1997, 1997, 1998, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008 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
+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,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -15,37 +15,37 @@ 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.  */

 
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
 #ifndef WGET_H
 
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
 #ifndef WGET_H

-#error Include mswindows.h inside or after "wget.h"
+# error This file should not be included directly.

 #endif
 
 /* Prevent inclusion of <winsock*.h> in <windows.h>.  */
 #ifndef WIN32_LEAN_AND_MEAN
 #endif
 
 /* Prevent inclusion of <winsock*.h> in <windows.h>.  */
 #ifndef WIN32_LEAN_AND_MEAN

-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN

 #endif
 
 #include <windows.h>
 
 #endif
 
 #include <windows.h>
 

-/* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h> only
-   on Watcom/MingW.  We cannot use <winsock.h> for IPv6.  Using
-   getaddrinfo() requires <ws2tcpip.h>.  */
-#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO)
+/* We need winsock2.h for IPv6 and ws2tcpip.h for getaddrinfo, so
+  include both in ENABLE_IPV6 case.  (ws2tcpip.h includes winsock2.h
+  only on MinGW.) */
+#ifdef ENABLE_IPV6

 # include <winsock2.h>
 # include <ws2tcpip.h>
 #else
 # include <winsock2.h>
 # include <ws2tcpip.h>
 #else


@@ -56,14 +56,12 @@ so, delete this exception statement from your version.  */
 # define EAI_SYSTEM -1   /* value doesn't matter */
 #endif
 
 # define EAI_SYSTEM -1   /* value doesn't matter */
 #endif
 

-/* Must include <sys/stat.h> because of 'stat' define below.  */
-#include <sys/stat.h>
-
-/* Missing in several .c files.  Include here.  */
+/* Declares file access functions, such as open, creat, access, and
+   chmod.  Unix declares these in unistd.h and fcntl.h.  */

 #include <io.h>
 
 #include <io.h>
 

-/* Apparently needed for alloca().  */
-#include <malloc.h>
+/* Declares getpid(). */
+#include <process.h>

 
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))


@@ -72,42 +70,102 @@ so, delete this exception statement from your version.  */
 # define S_ISLNK(a) 0
 #endif
 
 # define S_ISLNK(a) 0
 #endif
 

-/* We have strcasecmp and strncasecmp, just under a different name.  */
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
+/* We have strcasecmp and strncasecmp, just under different names.  */
+#ifndef HAVE_STRCASECMP
+# define strcasecmp stricmp
+#endif
+#ifndef HAVE_STRNCASECMP
+# define strncasecmp strnicmp
+#endif
+
+#include <stdio.h>

 
 /* The same for snprintf() and vsnprintf().  */
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
 
 /* The same for snprintf() and vsnprintf().  */
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 

-/* No stat on Windows.  */
-#define lstat stat
-
-#define PATH_SEPARATOR '\\'
+/* Define a wgint type under Windows. */
+typedef __int64 wgint;
+#define SIZEOF_WGINT 8

 
 

-/* Microsoft says stat is _stat, Borland doesn't.  */
-#ifdef _MSC_VER
-# define stat _stat
+/* str_to_wgint is a function with the semantics of strtol[l], but
+   which works on wgint.  */
+#if defined HAVE_STRTOLL
+# define str_to_wgint strtoll
+#elif defined HAVE__STRTOI64
+# define str_to_wgint _strtoi64
+#else
+# define str_to_wgint strtoll
+# define NEED_STRTOLL
+# define strtoll_type __int64

 #endif
 
 #endif
 

-#ifdef HAVE_ISATTY
-/* Microsoft VC supports _isatty; Borland?  */
-#ifdef _MSC_VER
-# define isatty _isatty
+/* Windows has no symlink, therefore no lstat.  Without symlinks lstat
+   is equivalent to stat anyway.  */
+#define lstat stat
+
+/* Define LFS aliases for stat and fstat. */
+#ifdef stat_alias
+# define stat(f, b) stat_alias (f, b)

 #endif
 #endif

+#ifdef fstat_alias
+# define fstat(f, b) fstat_alias (f, b)

 #endif
 
 #endif
 

-#define REALCLOSE(x) closesocket (x)
+#define PATH_SEPARATOR '\\'

 
 

-/* #### Do we need this?  */
+/* Win32 doesn't support the MODE argument to mkdir.  */

 #include <direct.h>
 #include <direct.h>

+#define mkdir(a, b) (mkdir) (a)
+
+/* Additional declarations needed for IPv6: */
+#ifdef ENABLE_IPV6
+const char *inet_ntop (int, const void *, char *, socklen_t);
+#endif
+
+#ifdef NEED_GAI_STRERROR
+# undef gai_strerror
+# define gai_strerror windows_strerror
+#endif

 
 

-/* Windows compilers accept only one arg to mkdir.  */
-#ifndef __BORLANDC__
-# define mkdir(a, b) _mkdir(a)
-#else  /* __BORLANDC__ */
-# define mkdir(a, b) mkdir(a)
-#endif /* __BORLANDC__ */
+#ifndef INHIBIT_WRAP
+
+/* Winsock functions don't set errno, so we provide wrappers that do. */
+
+#define socket wrapped_socket
+#define bind wrapped_bind
+#define connect wrapped_connect
+#define listen wrapped_listen
+#define accept wrapped_accept
+#define recv wrapped_recv
+#define send wrapped_send
+#define select wrapped_select
+#define getsockname wrapped_getsockname
+#define getpeername wrapped_getpeername
+#define setsockopt wrapped_setsockopt
+#define closesocket wrapped_closesocket
+
+#endif /* not INHIBIT_WRAP */
+
+int wrapped_socket (int, int, int);
+int wrapped_bind (int, struct sockaddr *, int);
+int wrapped_connect (int, const struct sockaddr *, int);
+int wrapped_listen (int s, int backlog);
+int wrapped_accept (int s, struct sockaddr *a, int *alen);
+int wrapped_recv (int, void *, int, int);
+int wrapped_send (int, const void *, int, int);
+int wrapped_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *);
+int wrapped_getsockname (int, struct sockaddr *, int *);
+int wrapped_getpeername (int, struct sockaddr *, int *);
+int wrapped_setsockopt (int, int, int, const void *, int);
+int wrapped_closesocket (int);
+
+/* Finally, provide a private version of strerror that does the
+   right thing with Winsock errors. */
+#ifndef INHIBIT_WRAP
+# define strerror windows_strerror
+#endif
+const char *windows_strerror (int);

 
 /* Declarations of various socket errors:  */
 
 
 /* Declarations of various socket errors:  */
 


@@ -149,27 +207,10 @@ so, delete this exception statement from your version.  */
 
 /* Public functions.  */
 
 
 /* Public functions.  */
 

-#ifndef HAVE_SLEEP
-unsigned int sleep (unsigned);
-#endif
-#ifndef HAVE_USLEEP
-int usleep (unsigned long);
-#endif
-

 void ws_startup (void);
 void ws_startup (void);

-void ws_changetitle (const char*, int);
+void ws_changetitle (const char *);

 void ws_percenttitle (double);
 char *ws_mypath (void);
 void ws_percenttitle (double);
 char *ws_mypath (void);

-void windows_main_junk (int *, char **, char **);
-
-/* Things needed for IPv6; missing in <ws2tcpip.h>.  */
-#ifdef ENABLE_IPV6
-# ifndef HAVE_NTOP
-  extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
-# endif
-# ifndef HAVE_PTON
-  extern int inet_pton (int af, const char *src, void *dst);
-# endif
-#endif /* ENABLE_IPV6 */
+void windows_main (char **);

 
 #endif /* MSWINDOWS_H */
 
 #endif /* MSWINDOWS_H */