diff options
Diffstat (limited to 'mu/wicket.c')
| -rw-r--r-- | mu/wicket.c | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/mu/wicket.c b/mu/wicket.c index 2615cdf5f..2ea8eec99 100644 --- a/mu/wicket.c +++ b/mu/wicket.c @@ -75,6 +75,10 @@ wicket_match (mu_stream_t stream, const char *str) int rc, ret; mu_url_t u, url; struct mu_debug_locus loc; + int flags = MU_URL_PARSE_ALL; + + if (wicket_verbose > 2) + flags &= ~MU_URL_PARSE_HIDEPASS; rc = mu_url_create (&u, str); if (rc) @@ -82,12 +86,6 @@ wicket_match (mu_stream_t stream, const char *str) mu_diag_funcall (MU_DIAG_ERROR, "mu_url_create", str, rc); return 2; } - rc = mu_url_parse (u); - if (rc) - { - mu_diag_funcall (MU_DIAG_ERROR, "mu_url_parse", str, rc); - return 2; - } rc = mu_stream_seek (stream, 0, MU_SEEK_SET, NULL); if (rc) @@ -97,7 +95,7 @@ wicket_match (mu_stream_t stream, const char *str) } loc.file = wicket_file; loc.line = 0; - rc = mu_wicket_stream_match_url (stream, &loc, u, &url); + rc = mu_wicket_stream_match_url (stream, &loc, u, flags, &url); switch (rc) { case 0: @@ -106,27 +104,7 @@ wicket_match (mu_stream_t stream, const char *str) { printf ("%s: %s:%d", str, loc.file, loc.line); if (wicket_verbose > 1) - { - printf (": %s", mu_url_to_string (url)); - if (wicket_verbose > 2) - { - mu_secret_t s; - rc = mu_url_get_secret (url, &s); - if (rc == 0) - { - printf (": %s", mu_secret_password (s)); - mu_secret_password_unref (s); - mu_secret_unref (s); - } - else if (rc == MU_ERR_NOENT) - printf (": [%s]", _("no password")); - else - { - printf (": [error: %s]", mu_strerror (rc)); - ret = 2; - } - } - } + printf (": %s", mu_url_to_string (url)); putchar ('\n'); } break; |