Reuse mutt_get_field for mutt_get_field_unbuffered.

diff --git a/account.c b/account.c
index 99146629bc7c58d6be58caa7501296420c350b3e..d20d2fe11e0f6e5c96cbf6c32240cb26d9e7f4ef 100644 (file)
--- a/account.c
+++ b/account.c
@@ -153,7 +153,7 @@ int mutt_account_getuser (ACCOUNT* account)
   {
     snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host);
     strfcpy (account->user, NONULL (Username), sizeof (account->user));
-    if (mutt_get_string_unbuffered (prompt, account->user, sizeof (account->user), 0))
+    if (mutt_get_field_unbuffered (prompt, account->user, sizeof (account->user), 0))
       return -1;
   }
 

diff --git a/curs_lib.c b/curs_lib.c
index 65398917117c28816411423bf3a25381dd226821..eb4be076213129caf406b2ee6709121afc2b9d90 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -138,16 +138,14 @@ int _mutt_get_field (/* const */ char *field, char *buf, size_t buflen, int comp
   return (ret);
 }
 
-int mutt_get_string_unbuffered (char *msg, char *buf, size_t buflen, int flags)
+int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags)
 {
   int rc;
-  
-  CLEARLINE (LINES-1);
-  addstr (msg);
+
   set_option (OPTUNBUFFEREDINPUT);
-  rc = mutt_enter_string (buf, buflen, LINES - 1, mutt_strlen (msg), flags);
+  rc = mutt_get_field (msg, buf, buflen, flags);
   unset_option (OPTUNBUFFEREDINPUT);
-  CLEARLINE (LINES-1);
+
   return (rc);
 }
 

diff --git a/protos.h b/protos.h
index f9f7d9281970c01e571c1ff7e6ce7683054447fb..5b23ee4bbcff931933c306e7153786be50a4d3b5 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -293,8 +293,8 @@ int _mutt_enter_string (char *, size_t, int, int, int, int, char ***, int *, ENT
 #define mutt_get_field(A,B,C,D) _mutt_get_field(A,B,C,D,0,NULL,NULL)
 int _mutt_get_field (char *, char *, size_t, int, int, char ***, int *);
 int mutt_get_hook_type (const char *);
-int mutt_get_string_unbuffered (char *, char *, size_t, int);
-#define mutt_get_password(A,B,C) mutt_get_string_unbuffered(A,B,C,M_PASS)
+int mutt_get_field_unbuffered (char *, char *, size_t, int);
+#define mutt_get_password(A,B,C) mutt_get_field_unbuffered(A,B,C,M_PASS)
 int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, size_t);
 int mutt_get_tmp_attachment (BODY *);
 int mutt_index_menu (void);