X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fretr.c;h=135f599e3eff8af0e4cac97dfbe3d282eb8ea61a;hp=d51b7e7f117b2a483e7a857b595af70c7f949808;hb=8c2fd06ba80b5312b4540859d452664450ec054f;hpb=6c30653a1aad1dd2125122adfd477480cc9c9ca5 diff --git a/src/retr.c b/src/retr.c index d51b7e7f..135f599e 100644 --- a/src/retr.c +++ b/src/retr.c @@ -37,6 +37,9 @@ as that of the covered work. */ #include #include #include +#ifdef VMS +# include /* For delete(). */ +#endif #include "exits.h" #include "utils.h" @@ -223,7 +226,8 @@ write_data (FILE *out, FILE *out2, const char *buf, int bufsize, data to OUT2, -3 is returned. */ int -fd_read_body (int fd, FILE *out, wgint toread, wgint startpos, +fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread, wgint startpos, + wgint *qtyread, wgint *qtywritten, double *elapsed, int flags, FILE *out2) { @@ -259,13 +263,13 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos, if (flags & rb_skip_startpos) skip = startpos; - if (opt.verbose) + if (opt.show_progress) { /* If we're skipping STARTPOS bytes, pass 0 as the INITIAL argument to progress_create because the indicator doesn't (yet) know about "skipping" data. */ wgint start = skip ? 0 : startpos; - progress = progress_create (start, start + toread); + progress = progress_create (downloaded_filename, start, start + toread); progress_interactive = progress_interactive_p (progress); } @@ -408,7 +412,7 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos, if (progress) progress_update (progress, ret, ptimer_read (timer)); #ifdef WINDOWS - if (toread > 0 && !opt.quiet) + if (toread > 0 && opt.show_progress) ws_percenttitle (100.0 * (startpos + sum_read) / (startpos + toread)); #endif @@ -677,22 +681,23 @@ calc_rate (wgint bytes, double secs, int *units) } -#define SUSPEND_POST_DATA do { \ - post_data_suspended = true; \ - saved_post_data = opt.body_data; \ - saved_post_file_name = opt.body_file; \ +#define SUSPEND_METHOD do { \ + method_suspended = true; \ + saved_body_data = opt.body_data; \ + saved_body_file_name = opt.body_file; \ + saved_method = opt.method; \ opt.body_data = NULL; \ opt.body_file = NULL; \ opt.method = NULL; \ } while (0) -#define RESTORE_POST_DATA do { \ - if (post_data_suspended) \ +#define RESTORE_METHOD do { \ + if (method_suspended) \ { \ - opt.body_data = saved_post_data; \ - opt.body_file = saved_post_file_name; \ - post_data_suspended = false; \ - opt.method = "POST"; \ + opt.body_data = saved_body_data; \ + opt.body_file = saved_body_file_name; \ + opt.method = saved_method; \ + method_suspended = false; \ } \ } while (0) @@ -720,9 +725,10 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, char *local_file; int redirection_count = 0; - bool post_data_suspended = false; - char *saved_post_data = NULL; - char *saved_post_file_name = NULL; + bool method_suspended = false; + char *saved_body_data = NULL; + char *saved_method = NULL; + char *saved_body_file_name = NULL; /* If dt is NULL, use local storage. */ if (!dt) @@ -763,7 +769,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, proxy, error); xfree (url); xfree (error); - RESTORE_POST_DATA; + RESTORE_METHOD; result = PROXERR; goto bail; } @@ -772,7 +778,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, logprintf (LOG_NOTQUIET, _("Error in proxy URL %s: Must be HTTP.\n"), proxy); url_free (proxy_url); xfree (url); - RESTORE_POST_DATA; + RESTORE_METHOD; result = PROXERR; goto bail; } @@ -856,7 +862,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, xfree (url); xfree (mynewloc); xfree (error); - RESTORE_POST_DATA; + RESTORE_METHOD; goto bail; } @@ -878,7 +884,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, } xfree (url); xfree (mynewloc); - RESTORE_POST_DATA; + RESTORE_METHOD; result = WRONGCODE; goto bail; } @@ -901,8 +907,8 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, RFC2616 HTTP/1.1 introduces code 307 Temporary Redirect specifically to preserve the method of the request. */ - if (result != NEWLOCATION_KEEP_POST && !post_data_suspended) - SUSPEND_POST_DATA; + if (result != NEWLOCATION_KEEP_POST && !method_suspended) + SUSPEND_METHOD; goto redirected; } @@ -965,7 +971,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file, xfree (url); } - RESTORE_POST_DATA; + RESTORE_METHOD; bail: if (register_status) @@ -1180,7 +1186,16 @@ free_urlpos (struct urlpos *l) void rotate_backups(const char *fname) { - int maxlen = strlen (fname) + 1 + numdigit (opt.backups) + 1; +#ifdef __VMS +# define SEP "_" +# define AVS ";*" /* All-version suffix. */ +# define AVSL (sizeof (AVS) - 1) +#else +# define SEP "." +# define AVSL 0 +#endif + + int maxlen = strlen (fname) + sizeof (SEP) + numdigit (opt.backups) + AVSL; char *from = (char *)alloca (maxlen); char *to = (char *)alloca (maxlen); struct_stat sb; @@ -1192,12 +1207,24 @@ rotate_backups(const char *fname) for (i = opt.backups; i > 1; i--) { - sprintf (from, "%s.%d", fname, i - 1); - sprintf (to, "%s.%d", fname, i); +#ifdef VMS + /* Delete (all versions of) any existing max-suffix file, to avoid + * creating multiple versions of it. (On VMS, rename() will + * create a new version of an existing destination file, not + * destroy/overwrite it.) + */ + if (i == opt.backups) + { + sprintf (to, "%s%s%d%s", fname, SEP, i, AVS); + delete (to); + } +#endif + sprintf (to, "%s%s%d", fname, SEP, i); + sprintf (from, "%s%s%d", fname, SEP, i - 1); rename (from, to); } - sprintf (to, "%s.%d", fname, 1); + sprintf (to, "%s%s%d", fname, SEP, 1); rename(fname, to); }