moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Fix Windows problems introduced by LFS. Published in

Browse Source 
<87k6oynmj0.fsf@xemacs.org>.
This commit is contained in:
hniksic 2005-02-24 04:58:00 -08:00
parent 17421d0a9f
commit f80f35d480
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2005-02-24 Hrvoje Niksic <hniksic@xemacs.org>
* mswindows.c (wget_ftello): Removed.
* mswindows.h: Remove bogus definition of stat.
(wget_ftello): Remove the leftover ftello replacement.
2005-02-20 Hrvoje Niksic <hniksic@xemacs.org> 2005-02-20 Hrvoje Niksic <hniksic@xemacs.org>
* mswindows.c (wget_ftello): Wget's replacement for ftello. * mswindows.c (wget_ftello): Wget's replacement for ftello.

17
src/mswindows.c
View File

@ -209,23 +209,6 @@ str_to_int64 (const char *nptr, char **endptr, int base)
#endif /* !defined(_MSC_VER) || _MSC_VER >= 1300 */ #endif /* !defined(_MSC_VER) || _MSC_VER >= 1300 */
/* A simple clone of ftello. The normal ftell doesn't work for large
files, so this is needed, and used by file_size(), which is itself
used for the --post-file option.
This function uses fgetpos incorrectly and should be considered a
hack until a better way to tell the stream position is found. */
__int64
wget_ftello (FILE *fp)
{
fpos_t pos;
if (fgetpos (fp, &pos) != 0)
return -1;
else
return pos;
}
void void
windows_main_junk (int *argc, char **argv, char **exec_name) windows_main_junk (int *argc, char **argv, char **exec_name)
{ {

14
src/mswindows.h
View File

@ -99,16 +99,11 @@ __int64 str_to_int64 (const char *, char **, int);
/* Transparently support large files, in spirit similar to the POSIX /* Transparently support large files, in spirit similar to the POSIX
LFS API. */ LFS API. */
#define stat(fname, buf) _stati64 (fname, buf) #define stat(fname, buf) _stati64 (fname, buf)
#define fstat(fd, buf) _fstati64(fd, buf) #define fstat(fd, buf) _fstati64 (fd, buf)
#define struct_stat struct _stati64 #define struct_stat struct _stati64
#define PATH_SEPARATOR '\\' #define PATH_SEPARATOR '\\'
/* Microsoft says stat is _stat, Borland doesn't. */
#ifdef _MSC_VER
# define stat _stat
#endif
#ifdef HAVE_ISATTY #ifdef HAVE_ISATTY
/* Microsoft VC supports _isatty; Borland? */ /* Microsoft VC supports _isatty; Borland? */
#ifdef _MSC_VER #ifdef _MSC_VER
@ -116,13 +111,6 @@ __int64 str_to_int64 (const char *, char **, int);
#endif #endif
#endif #endif
/* If ftello is unavailable, use an approximation. */
#ifndef HAVE_FTELLO
__int64 wget_ftello (FILE *);
# define ftello wget_ftello
# define HAVE_FTELLO
#endif
/* #### Do we need this? */ /* #### Do we need this? */
#include <direct.h> #include <direct.h>