From b5c9573ad6396acf3e4e33d0ae0db65b413b0d66 Mon Sep 17 00:00:00 2001 From: Merinov Nikolay Date: Wed, 29 Sep 2010 13:34:09 +0200 Subject: [PATCH] Add --unlink. --- doc/ChangeLog | 4 ++++ doc/wget.texi | 7 +++++++ src/ChangeLog | 12 ++++++++++++ src/exits.c | 1 + src/ftp.c | 18 +++++++++++++++++- src/http.c | 20 ++++++++++++++++++++ src/init.c | 1 + src/main.c | 3 +++ src/options.h | 1 + src/wget.h | 3 ++- 10 files changed, 68 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index c404f75d..c1bae6c1 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2010-09-25 Merinov Nikolay + + * wget.texi (Download Options): Document --unlink option. + 2010-09-13 Giuseppe Scrivano * wget.texi (Recursive Accept/Reject Options): Remove superfluous dot. diff --git a/doc/wget.texi b/doc/wget.texi index 675a036a..950c1eaa 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -1075,6 +1075,13 @@ header and in HTML @code{Content-Type http-equiv} meta tag. You can set the default encoding using the @code{remoteencoding} command in @file{.wgetrc}. That setting may be overridden from the command line. + +@cindex unlink +@item --unlink + +Force Wget to unlink file instead of clobbering existing file. This +option is useful for downloading to the directory with hardlinks. + @end table @node Directory Options, HTTP Options, Download Options, Invoking diff --git a/src/ChangeLog b/src/ChangeLog index 0e244f8f..624ae485 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2010-09-25 Merinov Nikolay + + * init.c: Add "unlink" command into command list. + * main.c: Add "unlink" option into option_data list. + * options.h: Adding unlink field into struct options. + * wget.h: Addind UNLINKERR error into uerr_t enum. + * exits.c (get_status_for_err): define status for UNLINKERR. + * ftp.c (getftp): unlink file if exists, instead clobbering. + (ftp_loop_internal): processing UNLINKERR. + * http.c (gethttp): unlink file if exists, instead clobbering. + (http_loop): processing UNLINKERR. + 2010-09-24 Dennis, CHENG Renquan Fix problem when content-disposition is used with recursive downloading. diff --git a/src/exits.c b/src/exits.c index 273a6778..23a66ac1 100644 --- a/src/exits.c +++ b/src/exits.c @@ -59,6 +59,7 @@ get_status_for_err (uerr_t err) case RETROK: return WGET_EXIT_SUCCESS; case FOPENERR: case FOPEN_EXCL_ERR: case FWRITEERR: case WRITEFAILED: + case UNLINKERR: return WGET_EXIT_IO_FAIL; case NOCONERROR: case HOSTERR: case CONSOCKERR: case CONERROR: case CONSSLERR: case CONIMPOSSIBLE: case FTPRERR: case FTPINVPASV: diff --git a/src/ftp.c b/src/ftp.c index d3f6b18b..cba54500 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -1173,7 +1173,22 @@ Error in server response, closing control connection.\n")); } else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct || opt.output_document) - { + { + if (opt.unlink && file_exists_p (con->target)) + { + int res = unlink (con->target); + if (res < 0) + { + logprintf (LOG_NOTQUIET, "%s: %s\n", con->target, + strerror (errno)); + fd_close (csock); + con->csock = -1; + fd_close (dtsock); + fd_close (local_sock); + return UNLINKERR; + } + } + #ifdef __VMS int open_id; @@ -1484,6 +1499,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con, char **local_fi { case HOSTERR: case CONIMPOSSIBLE: case FWRITEERR: case FOPENERR: case FTPNSFOD: case FTPLOGINC: case FTPNOPASV: case CONTNOTSUPPORTED: + case UNLINKERR: /* Fatal errors, give up. */ return err; case CONSOCKERR: case CONERROR: case FTPSRVERR: case FTPRERR: diff --git a/src/http.c b/src/http.c index 0b1d644b..6d9b1e9b 100644 --- a/src/http.c +++ b/src/http.c @@ -2486,6 +2486,19 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file)); } else if (ALLOW_CLOBBER) { + if (opt.unlink && file_exists_p (hs->local_file)) + { + int res = unlink (hs->local_file); + if (res < 0) + { + logprintf (LOG_NOTQUIET, "%s: %s\n", hs->local_file, + strerror (errno)); + CLOSE_INVALIDATE (sock); + xfree (head); + return UNLINKERR; + } + } + #ifdef __VMS int open_id; @@ -2782,6 +2795,13 @@ Spider mode enabled. Check if remote file exists.\n")); logprintf (LOG_NOTQUIET, _("Unable to establish SSL connection.\n")); ret = err; goto exit; + case UNLINKERR: + /* Another fatal error. */ + logputs (LOG_VERBOSE, "\n"); + logprintf (LOG_NOTQUIET, _("Cannot unlink %s (%s).\n"), + quote (hstat.local_file), strerror (errno)); + ret = err; + goto exit; case NEWLOCATION: /* Return the new location to the caller. */ if (!*newloc) diff --git a/src/init.c b/src/init.c index 22394d11..db67868c 100644 --- a/src/init.c +++ b/src/init.c @@ -253,6 +253,7 @@ static const struct { { "timestamping", &opt.timestamping, cmd_boolean }, { "tries", &opt.ntry, cmd_number_inf }, { "trustservernames", &opt.trustservernames, cmd_boolean }, + { "unlink", &opt.unlink, cmd_boolean }, { "useproxy", &opt.use_proxy, cmd_boolean }, { "user", &opt.user, cmd_string }, { "useragent", NULL, cmd_spec_useragent }, diff --git a/src/main.c b/src/main.c index 53e27ce9..03c6b862 100644 --- a/src/main.c +++ b/src/main.c @@ -266,6 +266,7 @@ static struct cmdline_option option_data[] = { "timeout", 'T', OPT_VALUE, "timeout", -1 }, { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 }, { "tries", 't', OPT_VALUE, "tries", -1 }, + { "unlink", 0, OPT_BOOLEAN, "unlink", -1 }, { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 }, { "use-server-timestamps", 0, OPT_BOOLEAN, "useservertimestamps", -1 }, { "user", 0, OPT_VALUE, "user", -1 }, @@ -515,6 +516,8 @@ Download:\n"), --local-encoding=ENC use ENC as the local encoding for IRIs.\n"), N_("\ --remote-encoding=ENC use ENC as the default remote encoding.\n"), + N_("\ + --unlink remove file before clobber.\n"), "\n", N_("\ diff --git a/src/options.h b/src/options.h index 9fbedb78..e9fe2d2c 100644 --- a/src/options.h +++ b/src/options.h @@ -54,6 +54,7 @@ struct options bool protocol_directories; /* Whether to prepend "http"/"ftp" to dirs. */ bool noclobber; /* Disables clobbering of existing data. */ + bool unlink; /* remove file before clobbering */ char *dir_prefix; /* The top of directory tree */ char *lfilename; /* Log filename */ char *input_filename; /* Input filename */ diff --git a/src/wget.h b/src/wget.h index bbefae05..c267cbf8 100644 --- a/src/wget.h +++ b/src/wget.h @@ -351,7 +351,8 @@ typedef enum RETRBADPATTERN, RETNOTSUP /* ! */, ROBOTSOK /* ! */, NOROBOTS /* ! */, PROXERR, /* 50 */ - AUTHFAILED, QUOTEXC, WRITEFAILED, SSLINITFAILED, VERIFCERTERR + AUTHFAILED, QUOTEXC, WRITEFAILED, SSLINITFAILED, VERIFCERTERR, + UNLINKERR } uerr_t; /* 2005-02-19 SMS. -- 2.39.2