From e8635044b58ff0fb93465758e70867428bd4cc1b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 6 Sep 2005 13:27:18 +0000 Subject: [PATCH] Now curl warns if an unknown variable is used in the -w/--writeout argument. --- CHANGES | 3 +++ src/writeout.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index be0696565..a04b5dbe7 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,9 @@ Changelog +Daniel (6 September 2005) +- Now curl warns if an unknown variable is used in the -w/--writeout argument. + Daniel (4 September 2005) - I applied Nicolas François' man page patch he posted to the Debian bug tracker. It corrected two lines that started with apostrophes, which isn't diff --git a/src/writeout.c b/src/writeout.c index 99a95ae36..d3c246c51 100644 --- a/src/writeout.c +++ b/src/writeout.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -112,11 +112,13 @@ void ourWriteOut(CURL *curl, char *writeinfo) char keepit; int i; if(('{' == ptr[1]) && (end=strchr(ptr, '}'))) { + bool match = FALSE; ptr+=2; /* pass the % and the { */ keepit=*end; *end=0; /* zero terminate */ for(i=0; replacements[i].name; i++) { if(curl_strequal(ptr, replacements[i].name)) { + match = TRUE; switch(replacements[i].id) { case VAR_EFFECTIVE_URL: if((CURLE_OK == @@ -217,6 +219,9 @@ void ourWriteOut(CURL *curl, char *writeinfo) break; } } + if(!match) { + fprintf(stderr, "curl: unknown --writeout variable: '%s'\n", ptr); + } ptr=end+1; /* pass the end */ *end = keepit; }