aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--docs/curl.19
-rw-r--r--src/main.c8
3 files changed, 21 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index dc3dc171b..3afd8474f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
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)
- Ravi Pratap provided work on libcurl making pipelining more robust and
fixing some bugs:
diff --git a/docs/curl.1 b/docs/curl.1
index 56659e8c8..245ef3d5e 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -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
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.
.IP "--trace-ascii <file>"
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
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.
.IP "--trace-time"
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
\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"
Displays information about curl and the libcurl version it uses.
diff --git a/src/main.c b/src/main.c
index ed6f338ef..167bfa5a0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1650,10 +1650,15 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
#endif
case 'g': /* --trace */
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;
break;
case 'h': /* --trace-ascii */
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;
break;
case 'i': /* --limit-rate */
@@ -2398,6 +2403,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
case 'v':
/* the '%' thing here will cause the trace get sent to stderr */
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;
break;
case 'V':