X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=165c4fd2181e0d5fcd576bb4a7c531fd3209f415;hp=46f6d307290cddd4c4105b873351aaf671587ff9;hb=daf6df95bfcc7efc888b488a825e467268f20d3c;hpb=b25e26b05ff3172041861e032cb839871367a480 diff --git a/curs_lib.c b/curs_lib.c index 46f6d30..165c4fd 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -15,6 +15,11 @@ # include "config.h" #endif +#include +#include +#include +#include + #include "mutt.h" #include "enter.h" #include "mutt_menu.h" @@ -22,11 +27,9 @@ #include "pager.h" #include "mbyte.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" +#include #include #include #include @@ -114,7 +117,7 @@ event_t mutt_getch (void) return (ch == ctrl ('G') ? err : ret); } -int _mutt_get_field ( /* const */ char *field, char *buf, size_t buflen, +int _mutt_get_field ( const char *field, char *buf, size_t buflen, int complete, int multiple, char ***files, int *numfiles) { int ret; @@ -156,19 +159,6 @@ void mutt_clear_error (void) CLEARLINE (LINES - 1); } -static void fix_end_of_file (const char *data) -{ - FILE *fp; - int c; - - if ((fp = safe_fopen (data, "a+")) == NULL) - return; - fseek (fp, -1, SEEK_END); - if ((c = fgetc (fp)) != '\n') - fputc ('\n', fp); - safe_fclose (&fp); -} - void mutt_edit_file (const char *editor, const char *data) { char cmd[LONG_STRING]; @@ -177,7 +167,6 @@ void mutt_edit_file (const char *editor, const char *data) mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data); if (mutt_system (cmd) == -1) mutt_error (_("Error running \"%s\"!"), cmd); - fix_end_of_file (data); keypad (stdscr, TRUE); clearok (stdscr, TRUE); } @@ -214,14 +203,14 @@ int mutt_yesorno (const char *msg, int def) * ensure there is enough room for the answer and truncate the question * to fit. */ - answer_string = mem_malloc (COLS + 1); + answer_string = p_new(char, COLS + 1); snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no, def == M_YES ? no : yes); - answer_string_len = str_len (answer_string); + answer_string_len = m_strlen(answer_string); printw ("%.*s%s", COLS - answer_string_len, msg, answer_string); - mem_free (&answer_string); + p_delete(&answer_string); - FOREVER { + for (;;) { mutt_refresh (); ch = mutt_getch (); if (CI_is_return (ch.ch)) @@ -275,7 +264,7 @@ void mutt_query_exit (void) curs_set (1); if (Timeout) timeout (-1); /* restore blocking operation */ - if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES) { + if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) { mutt_endwin (NULL); exit (1); } @@ -310,7 +299,6 @@ void mutt_curses_error (const char *fmt, ...) set_option (OPTMSGERR); } -#ifdef USE_SOCKET void mutt_progress_bar (progress_t* progress, long pos) { char posstr[SHORT_STRING]; @@ -318,8 +306,9 @@ void mutt_progress_bar (progress_t* progress, long pos) { if (!NetInc) mutt_message (progress->msg); else { - mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr), - progress->size); + if (progress->size) + mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr), + progress->size); progress->pos = 0; } } @@ -331,10 +320,12 @@ void mutt_progress_bar (progress_t* progress, long pos) { progress->pos = pos; pos = pos / (NetInc << 10) * (NetInc << 10); mutt_pretty_size (posstr, sizeof (posstr), pos); - mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr); + if (progress->size) + mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr); + else + mutt_message ("%s %s", progress->msg, posstr); } } -#endif void mutt_curses_message (const char *fmt, ...) { @@ -428,7 +419,7 @@ int mutt_do_pager (const char *banner, { int rc; - if (!Pager || str_cmp (Pager, "builtin") == 0) + if (!Pager || m_strcmp(Pager, "builtin") == 0) rc = mutt_pager (banner, tempfile, do_color, info); else { char cmd[STRING]; @@ -473,7 +464,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, *redraw = REDRAW_FULL; } else { - char *pc = mem_malloc (str_len (prompt) + 3); + char *pc = p_new(char, m_strlen(prompt) + 3); sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */ mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0); @@ -483,7 +474,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen, != 0) buf[0] = 0; MAYBE_REDRAW (*redraw); - mem_free (&pc); + p_delete(&pc); } return 0; @@ -497,7 +488,7 @@ void mutt_ungetch (int ch, int op) tmp.op = op; if (UngetCount >= UngetBufLen) - mem_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t)); + p_realloc(&KeyEvent, UngetBufLen += 128); KeyEvent[UngetCount++] = tmp; } @@ -538,7 +529,7 @@ int mutt_multi_choice (char *prompt, char *letters) mvaddstr (LINES - 1, 0, prompt); clrtoeol (); - FOREVER { + for (;;) { mutt_refresh (); ch = mutt_getch (); if (ch.ch == -1 || CI_is_return (ch.ch)) { @@ -553,7 +544,7 @@ int mutt_multi_choice (char *prompt, char *letters) } else if (ch.ch <= '9' && ch.ch > '0') { choice = ch.ch - '0'; - if (choice <= str_len (letters)) + if (choice <= m_strlen(letters)) break; } } @@ -574,7 +565,7 @@ int mutt_addwch (wchar_t wc) mbstate_t mbstate; size_t n1, n2; - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) || (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1)) return -1; /* ERR */ @@ -590,10 +581,10 @@ int mutt_addwch (wchar_t wc) * when printed. */ -void mutt_format_string (char *dest, size_t destlen, +void mutt_format_string (char *dest, ssize_t destlen, int min_width, int max_width, int right_justify, char m_pad_char, - const char *s, size_t n, int arboreal) + const char *s, ssize_t n, int arboreal) { char *p; wchar_t wc; @@ -602,8 +593,8 @@ void mutt_format_string (char *dest, size_t destlen, char scratch[MB_LEN_MAX]; mbstate_t mbstate1, mbstate2; - memset (&mbstate1, 0, sizeof (mbstate1)); - memset (&mbstate2, 0, sizeof (mbstate2)); + p_clear(&mbstate1, 1); + p_clear(&mbstate2, 1); --destlen; p = dest; for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) { @@ -628,7 +619,7 @@ void mutt_format_string (char *dest, size_t destlen, destlen -= k2; } } - w = (int) destlen < min_width ? destlen : min_width; + w = destlen < min_width ? destlen : min_width; if (w <= 0) *p = '\0'; else if (right_justify) { @@ -673,7 +664,7 @@ static void mutt_format_s_x (char *dest, } mutt_format_string (dest, destlen, min_width, max_width, - right_justify, ' ', s, str_len (s), arboreal); + right_justify, ' ', s, m_strlen(s), arboreal); } void mutt_format_s (char *dest, @@ -698,10 +689,10 @@ void mutt_paddstr (int n, const char *s) wchar_t wc; int w; size_t k; - size_t len = str_len (s); + size_t len = m_strlen(s); mbstate_t mbstate; - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) { if (k == (size_t) (-1) || k == (size_t) (-2)) { k = (k == (size_t) (-1)) ? 1 : len; @@ -722,7 +713,7 @@ void mutt_paddstr (int n, const char *s) } /* - * mutt_strwidth is like str_len except that it returns the width + * mutt_strwidth is like m_strlenexcept that it returns the width * refering to the number of characters cells. */ @@ -736,9 +727,9 @@ int mutt_strwidth (const char *s) if (!s) return 0; - n = str_len (s); + n = m_strlen(s); - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) { if (k == (size_t) (-1) || k == (size_t) (-2)) { k = (k == (size_t) (-1)) ? 1 : n;