moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Added sanity checks for -k, -p, -r and -N when -O is given. Added fixes for 64-bit platforms. Updated copyright and maintainer information.

This commit is contained in:
mtortonesi 2006-07-14 06:25:50 -07:00
parent 01798261db
commit 1c7493b83e
51 changed files with 297 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-07-14 Mauro Tortonesi <mauro@ferrara.linux.it>
* configure.in: Check for intptr_t.
2006-06-27 Hrvoje Niksic <hniksic@xemacs.org>
* configure.in: We're no longer using strtoimax.

2
configure.in
View File

@ -189,7 +189,7 @@ dnl Checks for non-universal or system-specific types.
dnl
AC_TYPE_SIZE_T
AC_TYPE_PID_T
AC_CHECK_TYPES([uint32_t, uintptr_t, int64_t])
AC_CHECK_TYPES([uint32_t, uintptr_t, intptr_t, int64_t])
AC_CHECK_TYPES(sig_atomic_t, [], [], [
#include <stdio.h>
#include <sys/types.h>

17
src/ChangeLog
View File

@ -1,4 +1,19 @@
2006-06-28 KJKHyperion <hackbunny@reactos.com>
2006-07-14 Mauro Tortonesi <mauro@ferrara.linux.it>
* sysdep.h: If intptr_t isn't defined, simply typedef it to long.
* http.c: Added explicit cast to int in logprintf call to remove
compiler warnings on 64-bit platforms.
* connect.c: Added a few casts to intptr_t to remove compiler warnings
on 64-bit platforms.
* main.c: Disable -r, -p and -N when -O is used. Disable -k when -O is
used and multiple URLs are given. Update maintainer information.
* all: Update copyright information.
2006-07-10 KJKHyperion <hackbunny@reactos.com>
* url.c (filechr_table): Mark DEL (0x7f) as a control character
and | as a character Windows can't handle.

2
src/cmpt.c
View File

@ -1,5 +1,5 @@
/* Replacements for routines missing on some systems.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

14
src/connect.c
View File

@ -1,5 +1,5 @@
/* Establishing and handling network connections.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.
@ -764,7 +764,7 @@ fd_register_transport (int fd, struct transport_implementation *imp, void *ctx)
info->ctx = ctx;
if (!transport_map)
transport_map = hash_table_new (0, NULL, NULL);
hash_table_put (transport_map, (void *) fd, info);
hash_table_put (transport_map, (void *)(intptr_t) fd, info);
++transport_map_modified_tick;
}
@ -775,7 +775,7 @@ fd_register_transport (int fd, struct transport_implementation *imp, void *ctx)
void *
fd_transport_context (int fd)
{
struct transport_info *info = hash_table_get (transport_map, (void *) fd);
struct transport_info *info = hash_table_get (transport_map, (void *)(intptr_t) fd);
return info->ctx;
}
@ -798,7 +798,7 @@ fd_transport_context (int fd)
info = last_info; \
else \
{ \
info = hash_table_get (transport_map, (void *) fd); \
info = hash_table_get (transport_map, (void *)(intptr_t) fd); \
last_fd = fd; \
last_info = info; \
last_tick = transport_map_modified_tick; \
@ -916,7 +916,7 @@ fd_errstr (int fd)
in case of error, never in a tight loop. */
struct transport_info *info = NULL;
if (transport_map)
info = hash_table_get (transport_map, (void *) fd);
info = hash_table_get (transport_map, (void *)(intptr_t) fd);
if (info && info->imp->errstr)
{
@ -941,7 +941,7 @@ fd_close (int fd)
per socket, so that particular optimization wouldn't work. */
info = NULL;
if (transport_map)
info = hash_table_get (transport_map, (void *) fd);
info = hash_table_get (transport_map, (void *)(intptr_t) fd);
if (info && info->imp->closer)
info->imp->closer (fd, info->ctx);
@ -950,7 +950,7 @@ fd_close (int fd)
if (info)
{
hash_table_remove (transport_map, (void *) fd);
hash_table_remove (transport_map, (void *)(intptr_t) fd);
xfree (info);
++transport_map_modified_tick;
}

2
src/connect.h
View File

@ -1,5 +1,5 @@
/* Declarations for connect.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/convert.c
View File

@ -1,5 +1,5 @@
/* Conversion of links to local files.
Copyright (C) 2003-2005 Free Software Foundation, Inc.
Copyright (C) 2003-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/convert.h
View File

@ -1,5 +1,5 @@
/* Declarations for convert.c
Copyright (C) 2003-2005 Free Software Foundation, Inc.
Copyright (C) 2003-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/cookies.c
View File

@ -1,5 +1,5 @@
/* Support for cookies.
Copyright (C) 2001-2005 Free Software Foundation, Inc.
Copyright (C) 2001-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/cookies.h
View File

@ -1,5 +1,5 @@
/* Support for cookies.
Copyright (C) 2001-2005 Free Software Foundation, Inc.
Copyright (C) 2001-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ftp-basic.c
View File

@ -1,5 +1,5 @@
/* Basic FTP routines.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ftp.c
View File

@ -1,5 +1,5 @@
/* File Transfer Protocol support.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ftp.h
View File

@ -1,5 +1,5 @@
/* Declarations for FTP support.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/gnutls.c
View File

@ -1,5 +1,5 @@
/* SSL support via GnuTLS library.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/hash.c
View File

@ -1,5 +1,5 @@
/* Hash tables.
Copyright (C) 2000-2005 Free Software Foundation, Inc.
Copyright (C) 2000-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/host.c
View File

@ -1,5 +1,5 @@
/* Host name resolution and matching.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/host.h
View File

@ -1,5 +1,5 @@
/* Declarations for host.c
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/html-parse.c
View File

@ -1,5 +1,5 @@
/* HTML parser for Wget.
Copyright (C) 1998-2005 Free Software Foundation, Inc.
Copyright (C) 1998-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/html-parse.h
View File

@ -1,5 +1,5 @@
/* Declarations for html-parse.c.
Copyright (C) 1998-2005 Free Software Foundation, Inc.
Copyright (C) 1998-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/html-url.c
View File

@ -1,5 +1,5 @@
/* Collect URLs from HTML source.
Copyright (C) 1998-2005 Free Software Foundation, Inc.
Copyright (C) 1998-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/http-ntlm.c
View File

@ -1,5 +1,5 @@
/* NTLM code.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
Contributed by Daniel Stenberg.
This file is part of GNU Wget.

4
src/http.c
View File

@ -1,5 +1,5 @@
/* HTTP support.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.
@ -757,7 +757,7 @@ print_server_response (const struct response *resp, const char *prefix)
--e;
/* This is safe even on printfs with broken handling of "%.<n>s"
because resp->headers ends with \0. */
logprintf (LOG_VERBOSE, "%s%.*s\n", prefix, e - b, b);
logprintf (LOG_VERBOSE, "%s%.*s\n", prefix, (int) (e - b), b);
}
}

2
src/http.h
View File

@ -1,5 +1,5 @@
/* Declarations for HTTP.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/init.c
View File

@ -1,5 +1,5 @@
/* Reading/parsing the initialization file.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/init.h
View File

@ -1,5 +1,5 @@
/* Declarations for init.c.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/log.c
View File

@ -1,5 +1,5 @@
/* Messages logging.
Copyright (C) 1998-2005 Free Software Foundation, Inc.
Copyright (C) 1998-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/log.h
View File

@ -1,5 +1,5 @@
/* Declarations for log.c.
Copyright (C) 1998-2005 Free Software Foundation, Inc.
Copyright (C) 1998-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

30
src/main.c
View File

@ -1,5 +1,5 @@
/* Command line parsing.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.
@ -662,7 +662,7 @@ print_version (void)
{
printf ("GNU Wget %s\n\n", version_string);
fputs (_("\
Copyright (C) 2005 Free Software Foundation, Inc.\n"), stdout);
Copyright (C) 2006 Free Software Foundation, Inc.\n"), stdout);
fputs (_("\
This program is distributed in the hope that it will be useful,\n\
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
@ -670,6 +670,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
GNU General Public License for more details.\n"), stdout);
fputs (_("\nOriginally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"),
stdout);
fputs (_("\nCurrently maintained by Mauro Tortonesi <mauro@ferrara.linux.it>.\n"),
stdout);
exit (0);
}
@ -812,6 +814,8 @@ main (int argc, char *const *argv)
longindex = -1;
}
nurl = argc - optind;
/* All user options have now been processed, so it's now safe to do
interoption dependency checks. */
@ -853,8 +857,24 @@ Can't timestamp and not clobber old files at the same time.\n"));
exit (1);
}
#endif
if (opt.output_document
&& (opt.page_requisites
|| opt.recursive
|| opt.timestamping))
{
printf (_("Cannot specify -r, -p or -N if -O is given.\n"));
print_usage ();
exit (1);
}
if (opt.output_document
&& opt.convert_links
&& nurl > 1)
{
printf (_("Cannot specify both -k and -O if multiple URLs are given.\n"));
print_usage ();
exit (1);
}
nurl = argc - optind;
if (!nurl && !opt.input_filename)
{
/* No URL specified. */
@ -1055,3 +1075,7 @@ redirect_output_signal (int sig)
signal (sig, redirect_output_signal);
}
#endif
/*
* vim: et ts=2 sw=2
*/

2
src/mswindows.c
View File

@ -1,5 +1,5 @@
/* mswindows.c -- Windows-specific support
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/mswindows.h
View File

@ -1,5 +1,5 @@
/* Declarations for windows
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/openssl.c
View File

@ -1,5 +1,5 @@
/* SSL support via OpenSSL library.
Copyright (C) 2000-2005 Free Software Foundation, Inc.
Copyright (C) 2000-2006 Free Software Foundation, Inc.
Originally contributed by Christian Fraenkel.
This file is part of GNU Wget.

2
src/options.h
View File

@ -1,5 +1,5 @@
/* struct options.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/progress.c
View File

@ -1,5 +1,5 @@
/* Download progress.
Copyright (C) 2001-2005 Free Software Foundation, Inc.
Copyright (C) 2001-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/progress.h
View File

@ -1,5 +1,5 @@
/* Download progress.
Copyright (C) 2001-2005 Free Software Foundation, Inc.
Copyright (C) 2001-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ptimer.c
View File

@ -1,5 +1,5 @@
/* Portable timers.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ptimer.h
View File

@ -1,5 +1,5 @@
/* Declarations for ptimer.c.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/recur.c
View File

@ -1,5 +1,5 @@
/* Handling of recursive HTTP retrieving.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/recur.h
View File

@ -1,5 +1,5 @@
/* Declarations for recur.c.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/retr.c
View File

@ -1,5 +1,5 @@
/* File retrieval.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/retr.h
View File

@ -1,5 +1,5 @@
/* Declarations for retr.c.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/ssl.h
View File

@ -1,5 +1,5 @@
/* SSL support.
Copyright (C) 2000-2005 Free Software Foundation, Inc.
Copyright (C) 2000-2006 Free Software Foundation, Inc.
Originally contributed by Christian Fraenkel.
This file is part of GNU Wget.

7
src/sysdep.h
View File

@ -1,5 +1,5 @@
/* Dirty system-dependent hacks.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.
@ -210,4 +210,9 @@ typedef unsigned short uint32_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 */

2
src/test.c
View File

@ -1,5 +1,5 @@
/* Unit testing.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/test.h
View File

@ -1,5 +1,5 @@
/* Unit testing declarations.
Copyright (C) 2005 Free Software Foundation, Inc.
Copyright (C) 2005-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/url.c
View File

@ -1,5 +1,5 @@
/* URL handling.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/url.h
View File

@ -1,5 +1,5 @@
/* Declarations for url.c.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/utils.c
View File

@ -1,5 +1,5 @@
/* Various utility functions.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/utils.h
View File

@ -1,5 +1,5 @@
/* Declarations for utils.c.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/wget.h
View File

@ -1,5 +1,5 @@
/* Miscellaneous declarations.
Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1996-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/xmalloc.c
View File

@ -1,5 +1,5 @@
/* Wrappers around malloc and memory debugging support.
Copyright (C) 2003-2005 Free Software Foundation, Inc.
Copyright (C) 2003-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.

2
src/xmalloc.h
View File

@ -1,5 +1,5 @@
/* xmalloc.c declarations.
Copyright (C) 2003-2005 Free Software Foundation, Inc.
Copyright (C) 2003-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.