From 71d9447316133c8e447ca7538d9533e1ef61e0eb Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 10 Apr 2009 14:32:16 +0200 Subject: Goodbye readline "It's too big and too slow." -- man readline --- src/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 06f5975..8de5d6f 100644 --- a/src/main.c +++ b/src/main.c @@ -44,8 +44,6 @@ THE SOFTWARE. #include -#include - /* pandora.com library */ #include @@ -55,6 +53,7 @@ THE SOFTWARE. #include "terminal.h" #include "config.h" #include "ui.h" +#include "ui_readline.h" int main (int argc, char **argv) { /* handles */ @@ -79,6 +78,7 @@ int main (int argc, char **argv) { BarUiMsg (MSG_NONE, "Welcome to " PACKAGE "!\n"); /* init some things */ + BarTermSetEcho (0); curl_global_init (CURL_GLOBAL_SSL); xmlInitParser (); ao_initialize (); @@ -101,14 +101,16 @@ int main (int argc, char **argv) { } if (settings.username == NULL) { + char nameBuf[100]; BarUiMsg (MSG_QUESTION, "Username: "); - settings.username = readline (NULL); + BarReadlineStr (nameBuf, sizeof (nameBuf), 0); + settings.username = strdup (nameBuf); } if (settings.password == NULL) { - BarTermSetEcho (0); + char passBuf[100]; BarUiMsg (MSG_QUESTION, "Password: "); - settings.password = readline (NULL); - BarTermSetEcho (1); + BarReadlineStr (passBuf, sizeof (passBuf), 1); + settings.password = strdup (passBuf); BarUiMsg (MSG_NONE, "\n"); } -- cgit v1.2.3