summaryrefslogtreecommitdiff
path: root/src/account.c
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2016-01-03 21:01:07 +0100
committerAlfred E. Heggestad <aeh@db.org>2016-01-03 21:01:07 +0100
commit856d3a5ac00d21d7892d2020a16b33bbd4aa829f (patch)
treeeadf0ec6208cd9dcbda6c7a876f627df829f00c4 /src/account.c
parent435e7c62382df0adcfcec0bae6fd8e65c7dacbda (diff)
move password_prompt function to ui.c
Diffstat (limited to 'src/account.c')
-rw-r--r--src/account.c37
1 files changed, 5 insertions, 32 deletions
diff --git a/src/account.c b/src/account.c
index 846f6f9..7b32890 100644
--- a/src/account.c
+++ b/src/account.c
@@ -323,37 +323,6 @@ static int encode_uri_user(struct re_printf *pf, const struct uri *uri)
}
-/* TODO: move interactive code away from CORE, to a module */
-static int password_prompt(struct account *acc)
-{
- char pwd[64];
- char *nl;
- int err;
-
- (void)re_printf("Please enter password for %r@%r: ",
- &acc->luri.user, &acc->luri.host);
-
- /* note: blocking UI call */
- fgets(pwd, sizeof(pwd), stdin);
- pwd[sizeof(pwd) - 1] = '\0';
-
- nl = strchr(pwd, '\n');
- if (nl == NULL) {
- (void)re_printf("Invalid password (0 - 63 characters"
- " followed by newline)\n");
- return EINVAL;
- }
-
- *nl = '\0';
-
- err = str_dup(&acc->auth_pass, pwd);
- if (err)
- return err;
-
- return 0;
-}
-
-
int account_alloc(struct account **accp, const char *sipaddr)
{
struct account *acc;
@@ -399,7 +368,11 @@ int account_alloc(struct account **accp, const char *sipaddr)
/* optional password prompt */
if (!pl_isset(&acc->laddr.uri.password)) {
- err = password_prompt(acc);
+ (void)re_printf("Please enter password for %r@%r: ",
+ &acc->luri.user, &acc->luri.host);
+
+ /* TODO: move interactive code away from CORE, to a module */
+ err = ui_password_prompt(&acc->auth_pass);
if (err)
goto out;
}