amount of data and decrease SKIP. Increment *TOTAL by the amount
of data written. If OUT2 is not NULL, also write BUF to OUT2.
In case of error writing to OUT, -1 is returned. In case of error
- writing to OUT2, -2 is returned. In case of any other error,
- 1 is returned. */
+ writing to OUT2, -2 is returned. Return 1 if the whole BUF was
+ skipped. */
static int
write_data (FILE *out, FILE *out2, const char *buf, int bufsize,
{
sum_read += ret;
int write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written);
- if (write_res != 0)
+ if (write_res < 0)
{
ret = (write_res == -3) ? -3 : -2;
goto out;
e.g. "1022", "247", "12.5", "2.38". */
sprintf (res, "%.*f %s",
dlrate >= 99.95 ? 0 : dlrate >= 9.995 ? 1 : 2,
- dlrate, !opt.bits_fmt? rate_names[units]: rate_names_bits[units]);
+ dlrate, !opt.report_bps ? rate_names[units]: rate_names_bits[units]);
return res;
}
double dlrate;
double bibyte = 1000.0;
- if (!opt.bits_fmt)
+ if (!opt.report_bps)
bibyte = 1024.0;
#define SUSPEND_POST_DATA do { \
post_data_suspended = true; \
- saved_post_data = opt.post_data; \
- saved_post_file_name = opt.post_file_name; \
- opt.post_data = NULL; \
- opt.post_file_name = NULL; \
+ saved_post_data = opt.body_data; \
+ saved_post_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) \
{ \
- opt.post_data = saved_post_data; \
- opt.post_file_name = saved_post_file_name; \
+ opt.body_data = saved_post_data; \
+ opt.body_file = saved_post_file_name; \
+ opt.method = saved_method; \
post_data_suspended = false; \
} \
} while (0)
bool post_data_suspended = false;
char *saved_post_data = NULL;
+ char *saved_method = NULL;
char *saved_post_file_name = NULL;
/* If dt is NULL, use local storage. */
iri->utf8_encode = opt.enable_iri;
set_content_encoding (iri, NULL);
xfree_null (iri->orig_url);
+ iri->orig_url = NULL;
/* Now, see if this new location makes sense. */
newloc_parsed = url_parse (mynewloc, &up_error_code, iri, true);