Commit e3797391 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- 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.
parent 8b5295d0

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -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:

docs/curl.1

+8 −1
Original line number Diff line number Diff line
@@ -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.

src/main.c

+8 −0
Original line number Diff line number Diff line
@@ -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':