diff options
author | Daniel Stenberg <daniel@haxx.se> | 2018-09-11 22:03:47 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2018-09-13 08:04:49 +0200 |
commit | ddb06ffc0f680322ce746c6e8d524dee4de84955 (patch) | |
tree | f8ce7155cebecb080c2377ec890e45d5c6fda198 /src | |
parent | 92f9db17466c4e28998a5cf849c7a861093eff23 (diff) | |
download | curl-ddb06ffc0f680322ce746c6e8d524dee4de84955.tar.gz |
urlglob: improve error message
to help user understand what the problem is
Reported-by: Daniel Shahaf
Fixes #2763
Closes #2977
Diffstat (limited to 'src')
-rw-r--r-- | src/tool_urlglob.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index cb87706cc..e4a5c33db 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.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 @@ -459,18 +459,19 @@ CURLcode glob_url(URLGlob **glob, char *url, unsigned long *urlnum, *urlnum = amount; else { if(error && glob_expand->error) { - char text[128]; + char text[512]; const char *t; if(glob_expand->pos) { - snprintf(text, sizeof(text), "%s in column %zu", glob_expand->error, - glob_expand->pos); + snprintf(text, sizeof(text), "%s in URL position %zu:\n%s\n%*s^", + glob_expand->error, + glob_expand->pos, url, glob_expand->pos - 1, " "); t = text; } else t = glob_expand->error; /* send error description to the error-stream */ - fprintf(error, "curl: (%d) [globbing] %s\n", res, t); + fprintf(error, "curl: (%d) %s\n", res, t); } /* it failed, we cleanup */ glob_cleanup(glob_expand); |