diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_subr/prompt.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
Diffstat (limited to 'subversion/libsvn_subr/prompt.c')
| -rw-r--r-- | subversion/libsvn_subr/prompt.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/subversion/libsvn_subr/prompt.c b/subversion/libsvn_subr/prompt.c index 8f24b424042a2..086ff197f5933 100644 --- a/subversion/libsvn_subr/prompt.c +++ b/subversion/libsvn_subr/prompt.c @@ -814,6 +814,8 @@ plaintext_prompt_helper(svn_boolean_t *may_save_plaintext, const char *config_path = NULL; terminal_handle_t *terminal; + *may_save_plaintext = FALSE; /* de facto API promise */ + if (pb) SVN_ERR(svn_config_get_user_config_path(&config_path, pb->config_dir, SVN_CONFIG_CATEGORY_SERVERS, pool)); @@ -826,17 +828,7 @@ plaintext_prompt_helper(svn_boolean_t *may_save_plaintext, do { - svn_error_t *err = prompt(&answer, prompt_string, FALSE, pb, pool); - if (err) - { - if (err->apr_err == SVN_ERR_CANCELLED) - { - *may_save_plaintext = FALSE; - return err; - } - else - return err; - } + SVN_ERR(prompt(&answer, prompt_string, FALSE, pb, pool)); if (apr_strnatcasecmp(answer, _("yes")) == 0 || apr_strnatcasecmp(answer, _("y")) == 0) { |