X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmswindows.h;h=54821a7c63de203de090fa3add0466aefccf2f7d;hp=ced740cdbcf5344cbd5f1ec9e30cb831d2d83b43;hb=123f5c39669abc055987d69a311785c861494c87;hpb=f80f35d480046f4cc94bd050902037917f2a46ea
diff --git a/src/mswindows.h b/src/mswindows.h
index ced740cd..54821a7c 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,12 +1,12 @@
/* 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
-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,
@@ -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
-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 .
+
+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
-#error Include mswindows.h inside or after "wget.h"
+# error This file should not be included directly.
#endif
/* Prevent inclusion of in . */
#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
#endif
#include
-/* Use the correct winsock header; includes only
- on Watcom/MingW. We cannot use for IPv6. Using
- getaddrinfo() requires . */
-#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
# include
#else
@@ -56,14 +56,12 @@ so, delete this exception statement from your version. */
# define EAI_SYSTEM -1 /* value doesn't matter */
#endif
-/* Must include because of 'stat' define below. */
-#include
-
-/* 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
-/* Apparently needed for alloca(). */
-#include
+/* Declares getpid(). */
+#include
#ifndef S_ISDIR
# define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
@@ -72,9 +70,13 @@ so, delete this exception statement from your version. */
# 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
/* The same for snprintf() and vsnprintf(). */
#define snprintf _snprintf
@@ -84,42 +86,84 @@ so, delete this exception statement from your version. */
typedef __int64 wgint;
#define SIZEOF_WGINT 8
-#if defined(_MSC_VER) || defined (__WATCOMC__)
-# define WGINT_MAX 9223372036854775807I64
+/* 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 WGINT_MAX 9223372036854775807LL
+# define str_to_wgint strtoll
+# define NEED_STRTOLL
+# define strtoll_type __int64
#endif
-#define str_to_wgint str_to_int64
-__int64 str_to_int64 (const char *, char **, int);
-
-/* No lstat on Windows. */
+/* Windows has no symlink, therefore no lstat. Without symlinks lstat
+ is equivalent to stat anyway. */
#define lstat stat
-/* Transparently support large files, in spirit similar to the POSIX
- LFS API. */
-#define stat(fname, buf) _stati64 (fname, buf)
-#define fstat(fd, buf) _fstati64 (fd, buf)
-#define struct_stat struct _stati64
+/* Define LFS aliases for stat and fstat. */
+#ifdef stat_alias
+# define stat(f, b) stat_alias (f, b)
+#endif
+#ifdef fstat_alias
+# define fstat(f, b) fstat_alias (f, b)
+#endif
#define PATH_SEPARATOR '\\'
-#ifdef HAVE_ISATTY
-/* Microsoft VC supports _isatty; Borland? */
-#ifdef _MSC_VER
-# define isatty _isatty
-#endif
+/* Win32 doesn't support the MODE argument to mkdir. */
+#include
+#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
-/* #### Do we need this? */
-#include
+#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: */
@@ -161,27 +205,10 @@ __int64 str_to_int64 (const char *, char **, int);
/* Public functions. */
-#ifndef HAVE_SLEEP
-unsigned int sleep (unsigned);
-#endif
-#ifndef HAVE_USLEEP
-int usleep (unsigned long);
-#endif
-
void ws_startup (void);
void ws_changetitle (const char *);
void ws_percenttitle (double);
char *ws_mypath (void);
-void windows_main_junk (int *, char **, char **);
-
-/* Things needed for IPv6; missing in . */
-#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 */