mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
- Added warning outputs if the command line uses more than one of the options
-v, --trace and --trace-ascii, since it could really confuse the user. Clarified this fact in the man page.
This commit is contained in:
parent
8b5295d003
commit
e37973913d
5
CHANGES
5
CHANGES
@ -6,6 +6,11 @@
|
|||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
Daniel (23 February 2007)
|
||||||
|
- Added warning outputs if the command line uses more than one of the options
|
||||||
|
-v, --trace and --trace-ascii, since it could really confuse the user.
|
||||||
|
Clarified this fact in the man page.
|
||||||
|
|
||||||
Daniel (21 February 2007)
|
Daniel (21 February 2007)
|
||||||
- Ravi Pratap provided work on libcurl making pipelining more robust and
|
- Ravi Pratap provided work on libcurl making pipelining more robust and
|
||||||
fixing some bugs:
|
fixing some bugs:
|
||||||
|
@ -1033,6 +1033,9 @@ Enables a full trace dump of all incoming and outgoing data, including
|
|||||||
descriptive information, to the given output file. Use "-" as filename to have
|
descriptive information, to the given output file. Use "-" as filename to have
|
||||||
the output sent to stdout.
|
the output sent to stdout.
|
||||||
|
|
||||||
|
This option overrides previous uses of \fI-v/--verbose\fP or
|
||||||
|
\fI--trace-ascii\fP.
|
||||||
|
|
||||||
If this option is used several times, the last one will be used.
|
If this option is used several times, the last one will be used.
|
||||||
.IP "--trace-ascii <file>"
|
.IP "--trace-ascii <file>"
|
||||||
Enables a full trace dump of all incoming and outgoing data, including
|
Enables a full trace dump of all incoming and outgoing data, including
|
||||||
@ -1043,6 +1046,8 @@ This is very similar to \fI--trace\fP, but leaves out the hex part and only
|
|||||||
shows the ASCII part of the dump. It makes smaller output that might be easier
|
shows the ASCII part of the dump. It makes smaller output that might be easier
|
||||||
to read for untrained humans.
|
to read for untrained humans.
|
||||||
|
|
||||||
|
This option overrides previous uses of \fI-v/--verbose\fP or \fI--trace\fP.
|
||||||
|
|
||||||
If this option is used several times, the last one will be used.
|
If this option is used several times, the last one will be used.
|
||||||
.IP "--trace-time"
|
.IP "--trace-time"
|
||||||
Prepends a time stamp to each trace or verbose line that curl displays.
|
Prepends a time stamp to each trace or verbose line that curl displays.
|
||||||
@ -1084,7 +1089,9 @@ might be option you're looking for.
|
|||||||
If you think this option still doesn't give you enough details, consider using
|
If you think this option still doesn't give you enough details, consider using
|
||||||
\fI--trace\fP or \fI--trace-ascii\fP instead.
|
\fI--trace\fP or \fI--trace-ascii\fP instead.
|
||||||
|
|
||||||
If this option is used twice, the second will again disable verbose.
|
This option overrides previous uses of \fI--trace-ascii\fP or \fI--trace\fP.
|
||||||
|
|
||||||
|
If this option is used twice, the second will do nothing extra.
|
||||||
.IP "-V/--version"
|
.IP "-V/--version"
|
||||||
Displays information about curl and the libcurl version it uses.
|
Displays information about curl and the libcurl version it uses.
|
||||||
|
|
||||||
|
@ -1650,10 +1650,15 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
|
|||||||
#endif
|
#endif
|
||||||
case 'g': /* --trace */
|
case 'g': /* --trace */
|
||||||
GetStr(&config->trace_dump, nextarg);
|
GetStr(&config->trace_dump, nextarg);
|
||||||
|
if(config->tracetype && (config->tracetype != TRACE_BIN))
|
||||||
|
warnf(config, "--trace overrides an earlier trace/verbose option\n");
|
||||||
config->tracetype = TRACE_BIN;
|
config->tracetype = TRACE_BIN;
|
||||||
break;
|
break;
|
||||||
case 'h': /* --trace-ascii */
|
case 'h': /* --trace-ascii */
|
||||||
GetStr(&config->trace_dump, nextarg);
|
GetStr(&config->trace_dump, nextarg);
|
||||||
|
if(config->tracetype && (config->tracetype != TRACE_ASCII))
|
||||||
|
warnf(config,
|
||||||
|
"--trace-ascii overrides an earlier trace/verbose option\n");
|
||||||
config->tracetype = TRACE_ASCII;
|
config->tracetype = TRACE_ASCII;
|
||||||
break;
|
break;
|
||||||
case 'i': /* --limit-rate */
|
case 'i': /* --limit-rate */
|
||||||
@ -2398,6 +2403,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
|
|||||||
case 'v':
|
case 'v':
|
||||||
/* the '%' thing here will cause the trace get sent to stderr */
|
/* the '%' thing here will cause the trace get sent to stderr */
|
||||||
GetStr(&config->trace_dump, (char *)"%");
|
GetStr(&config->trace_dump, (char *)"%");
|
||||||
|
if(config->tracetype && (config->tracetype != TRACE_PLAIN))
|
||||||
|
warnf(config,
|
||||||
|
"-v/--verbose overrides an earlier trace/verbose option\n");
|
||||||
config->tracetype = TRACE_PLAIN;
|
config->tracetype = TRACE_PLAIN;
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
|
Loading…
Reference in New Issue
Block a user