[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 150/222: curl: --no-progress-meter
From: |
gnunet |
Subject: |
[gnurl] 150/222: curl: --no-progress-meter |
Date: |
Thu, 07 Nov 2019 00:10:46 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 93373a960c3bb45def7640bc775743dd8bec71c7
Author: Daniel Stenberg <address@hidden>
AuthorDate: Mon Oct 7 14:54:35 2019 +0200
curl: --no-progress-meter
New option that allows a user to ONLY switch off curl's progress meter
and leave everything else in "talkative" mode.
Reported-by: Piotr Komborski
Fixes #4422
Closes #4470
---
docs/cmdline-opts/progress-meter.d | 8 ++++++++
src/tool_getparam.c | 16 +++++++++++-----
src/tool_help.c | 2 ++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/docs/cmdline-opts/progress-meter.d
b/docs/cmdline-opts/progress-meter.d
new file mode 100644
index 000000000..3befb0ca0
--- /dev/null
+++ b/docs/cmdline-opts/progress-meter.d
@@ -0,0 +1,8 @@
+Long: progress-meter
+Help: Show the progress meter
+See-also: verbose silent
+Added: 7.67.0
+---
+Option to only switch the progress meter output on or off (with
+--no-progress-meter) without muting or otherwise affecting warning and
+informational messages like --silent does.
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 2012a91ac..3882cb97e 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -322,6 +322,7 @@ static const struct LongShort aliases[]= {
{"Z", "parallel", ARG_BOOL},
{"Zb", "parallel-max", ARG_STRING},
{"#", "progress-bar", ARG_BOOL},
+ {"#m", "progress-meter", ARG_BOOL},
{":", "next", ARG_NONE},
};
@@ -1172,11 +1173,16 @@ ParameterError getparameter(const char *flag, /* f or
-long-flag */
break;
}
break;
- case '#': /* --progress-bar */
- if(toggle)
- global->progressmode = CURL_PROGRESS_BAR;
- else
- global->progressmode = CURL_PROGRESS_STATS;
+ case '#':
+ switch(subletter) {
+ case 'm': /* --progress-meter */
+ global->noprogress = !toggle;
+ break;
+ default: /* --progress-bar */
+ global->progressmode =
+ toggle ? CURL_PROGRESS_BAR : CURL_PROGRESS_STATS;
+ break;
+ }
break;
case ':': /* --next */
return PARAM_NEXT_OPERATION;
diff --git a/src/tool_help.c b/src/tool_help.c
index ea78821f6..cc7acb017 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -295,6 +295,8 @@ static const struct helptxt helptext[] = {
"Use this proxy first"},
{"-#, --progress-bar",
"Display transfer progress as a bar"},
+ {" --progress-meter",
+ "Show the progress meter"},
{" --proto <protocols>",
"Enable/disable PROTOCOLS"},
{" --proto-default <protocol>",
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 122/222: AppVeyor: remove MSYS2_ARG_CONV_EXCL for winbuild, (continued)
- [gnurl] 122/222: AppVeyor: remove MSYS2_ARG_CONV_EXCL for winbuild, gnunet, 2019/11/06
- [gnurl] 125/222: urlapi: fix unused variable warning, gnunet, 2019/11/06
- [gnurl] 123/222: AppVeyor: add 32-bit MinGW-w64 build, gnunet, 2019/11/06
- [gnurl] 130/222: tool_operate: rename functions to make more sense, gnunet, 2019/11/06
- [gnurl] 129/222: curl: create easy handles on-demand and not ahead of time, gnunet, 2019/11/06
- [gnurl] 131/222: urlapi: fix URL encoding when setting a full URL, gnunet, 2019/11/06
- [gnurl] 114/222: docs: disambiguate CURLUPART_HOST is for host name (ie no port), gnunet, 2019/11/06
- [gnurl] 132/222: redirect: when following redirects to an absolute URL, URL encode it, gnunet, 2019/11/06
- [gnurl] 99/222: HTTP3: show an --alt-svc using example too, gnunet, 2019/11/06
- [gnurl] 98/222: FTP: url-decode path before evaluation, gnunet, 2019/11/06
- [gnurl] 150/222: curl: --no-progress-meter,
gnunet <=
- [gnurl] 128/222: CURLMOPT_MAX_CONCURRENT_STREAMS: new setopt, gnunet, 2019/11/06
- [gnurl] 137/222: cookie: avoid harmless use after free, gnunet, 2019/11/06
- [gnurl] 105/222: README: minor grammar fix, gnunet, 2019/11/06
- [gnurl] 103/222: quiche: don't close connection at end of stream!, gnunet, 2019/11/06
- [gnurl] 110/222: INSTALL: add vcpkg installation instructions, gnunet, 2019/11/06
- [gnurl] 101/222: Revert "FTP: url-decode path before evaluation", gnunet, 2019/11/06
- [gnurl] 104/222: HTTP3: fix prefix parameter for ngtcp2 build, gnunet, 2019/11/06
- [gnurl] 96/222: HTTP3: update quic.aiortc.org + add link to server list, gnunet, 2019/11/06
- [gnurl] 107/222: tests: fix narrowing conversion warnings, gnunet, 2019/11/06
- [gnurl] 116/222: BINDINGS: Kapito is an Erlang library, basically a binding, gnunet, 2019/11/06