moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

curl: Restore noprogress and isatty config values.

Browse Source 
The noprogress and isatty in Configurable are global, in a sense
that they persist in one curl invocation. Currently once one
download writes its response data to tty, they are set to FALSE
and they are not restored on successive downloads.  This change
first backups the current noprogress and isatty, and restores
them when download does not write its data to tty.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-06-21 01:00:53 +09:00 committed by Yang Tse
parent 196c8242ca
commit 7561a0fc83
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tool_operate.c
View File

@ -140,6 +140,9 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
int res = 0;
int i;
bool orig_noprogress = config->noprogress;
bool orig_isatty = config->isatty;
errorbuffer[0] = '\0';
/* default headers output stream is stdout */
memset(&hdrcbdata, 0, sizeof(struct HdrCbData));
@ -223,7 +226,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
('-' == argv[i][0])) {
char *nextarg;
bool passarg;
char *origopt = argv[i];
char *orig_opt = argv[i];
char *flag = argv[i];
@ -239,7 +242,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
int retval = CURLE_OK;
if(res != PARAM_HELP_REQUESTED) {
const char *reason = param2text(res);
helpf(config->errors, "option %s: %s\n", origopt, reason);
helpf(config->errors, "option %s: %s\n", orig_opt, reason);
retval = CURLE_FAILED_INIT;
}
res = retval;
@ -766,6 +769,12 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
/* we send the output to a tty, therefore we switch off the progress
meter */
config->noprogress = config->isatty = TRUE;
else {
/* progress meter is per download, so restore config
values */
config->noprogress = orig_noprogress;
config->isatty = orig_isatty;
}
if(urlnum > 1 && !(config->mute)) {
fprintf(config->errors, "\n[%d/%d]: %s --> %s\n",