X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=curs_lib.c;h=6e55a2b2e7ab8c437a52dc6c7cba78df249d5856;hb=5c310cabcfafe551dcad7638c007daae1c7d3710;hp=9c0567a0bb5af2436c5ab167c7e2094fb49e9774;hpb=3d937534e7b1ee723f86594b5e4c64c95158a933;p=apps%2Fmadmutt.git diff --git a/curs_lib.c b/curs_lib.c index 9c0567a..6e55a2b 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ +#if HAVE_CONFIG_H +# include "config.h" +#endif + #include "mutt.h" #include "mutt_menu.h" #include "mutt_curses.h" @@ -134,29 +138,6 @@ int _mutt_get_field (/* const */ char *field, char *buf, size_t buflen, int comp return (ret); } -int _mutt_get_field_att (/* const */ char *field, char *buf, size_t buflen, int complete, int multiple, char ***files, int *numfiles) -{ - int ret; - int x, y; - - ENTER_STATE *es = mutt_new_enter_state(); - - do - { - CLEARLINE (LINES-1); - addstr (field); - mutt_refresh (); - getyx (stdscr, y, x); - ret = _mutt_enter_string_att (buf, buflen, y, x, complete, multiple, files, numfiles, es); - } - while (ret == 1); - CLEARLINE (LINES-1); - mutt_free_enter_state (&es); - - return (ret); -} - - int mutt_get_password (char *msg, char *buf, size_t buflen) { int rc; @@ -315,6 +296,7 @@ void mutt_query_exit (void) void mutt_curses_error (const char *fmt, ...) { + char TmpErrorbuf[STRING]; va_list ap; va_start (ap, fmt); @@ -322,8 +304,9 @@ void mutt_curses_error (const char *fmt, ...) va_end (ap); dprint (1, (debugfile, "%s\n", Errorbuf)); - mutt_format_string (Errorbuf, sizeof (Errorbuf), + mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf), 0, COLS-2, 0, 0, Errorbuf, sizeof (Errorbuf), 0); + snprintf(Errorbuf,sizeof(Errorbuf),"%s",TmpErrorbuf); /* overkill */ if (!option (OPTKEEPQUIET)) { @@ -340,14 +323,16 @@ void mutt_curses_error (const char *fmt, ...) void mutt_curses_message (const char *fmt, ...) { + char TmpErrorbuf[STRING]; va_list ap; va_start (ap, fmt); vsnprintf (Errorbuf, sizeof (Errorbuf), fmt, ap); va_end (ap); - mutt_format_string (Errorbuf, sizeof (Errorbuf), + mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf), 0, COLS-2, 0, 0, Errorbuf, sizeof (Errorbuf), 0); + snprintf(Errorbuf,sizeof(Errorbuf),"%s",TmpErrorbuf); /* overkill */ if (!option (OPTKEEPQUIET)) {