diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_cb_hdr.c | 2 | ||||
| -rw-r--r-- | src/tool_cfgable.h | 1 | ||||
| -rw-r--r-- | src/tool_getparam.c | 7 | ||||
| -rw-r--r-- | src/tool_help.c | 2 | ||||
| -rw-r--r-- | src/tool_main.c | 3 |
5 files changed, 11 insertions, 4 deletions
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index 4e9e49a6d..88ce5e13b 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -163,7 +163,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata) if(!outs->stream && !tool_create_output_file(outs, FALSE)) return failure; - if(hdrcbdata->global->isatty) + if(hdrcbdata->global->isatty && hdrcbdata->global->styled_output) value = memchr(ptr, ':', cb); if(value) { size_t namelen = value - ptr; diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 3bd908879..9d995f85e 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -276,6 +276,7 @@ struct GlobalConfig { int progressmode; /* CURL_PROGRESS_BAR / CURL_PROGRESS_STATS */ char *libcurl; /* Output libcurl code to this file name */ bool fail_early; /* exit on first transfer error */ + bool styled_output; /* enable fancy output style detection */ struct OperationConfig *first; struct OperationConfig *current; struct OperationConfig *last; /* Always last in the struct */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 60a88e266..4b9ae0653 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -260,6 +260,7 @@ static const struct LongShort aliases[]= { {"EB", "socks5-gssapi", ARG_BOOL}, {"f", "fail", ARG_BOOL}, {"fa", "fail-early", ARG_BOOL}, + {"fb", "styled-output", ARG_BOOL}, {"F", "form", ARG_STRING}, {"Fs", "form-string", ARG_STRING}, {"g", "globoff", ARG_BOOL}, @@ -1643,8 +1644,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'a': /* --fail-early */ global->fail_early = toggle; break; - default: - /* fail hard on errors */ + case 'b': /* --styled-output */ + global->styled_output = toggle; + break; + default: /* --fail (hard on errors) */ config->failonerror = toggle; } break; diff --git a/src/tool_help.c b/src/tool_help.c index 71862511f..7c4dda3b0 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -414,6 +414,8 @@ static const struct helptxt helptext[] = { "Use SSLv3"}, {" --stderr", "Where to redirect stderr"}, + {" --styled-output", + "Enable styled output for HTTP headers"}, {" --suppress-connect-headers", "Suppress proxy CONNECT response headers"}, {" --tcp-fastopen", diff --git a/src/tool_main.c b/src/tool_main.c index 4e78d3321..b9f7eae2c 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -147,6 +147,7 @@ static CURLcode main_init(struct GlobalConfig *config) /* Initialise the global config */ config->showerror = -1; /* Will show errors */ config->errors = stderr; /* Default errors to stderr */ + config->styled_output = TRUE; /* enable detection */ /* Allocate the initial operate config */ config->first = config->last = malloc(sizeof(struct OperationConfig)); |