X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=enter.c;h=b310ea1fdb47aea81a6aa1dc1330b763e9276411;hp=7cd96dce34c15d01280632cfbbff04f2c9ce4d51;hb=65734c98c7ff56a0258bc9052667a0cb9c2f1d0b;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/enter.c b/enter.c index 7cd96dc..b310ea1 100644 --- a/enter.c +++ b/enter.c @@ -12,6 +12,8 @@ # include "config.h" #endif +#include + #include "mutt.h" #include "enter.h" #include "mutt_menu.h" @@ -20,7 +22,6 @@ #include "history.h" #include "buffy.h" -#include "lib/mem.h" #include @@ -79,14 +80,14 @@ static size_t width_ceiling (const wchar_t * s, size_t n, int w1) return s - s0; } -static void my_wcstombs (char *dest, size_t dlen, const wchar_t * src, +static void my_wcstombs (char *dest, ssize_t dlen, const wchar_t * src, size_t slen) { mbstate_t st; size_t k; /* First convert directly into the destination buffer */ - memset (&st, 0, sizeof (st)); + p_clear(&st, 1); for (; slen && dlen >= MB_LEN_MAX; dest += k, dlen -= k, src++, slen--) if ((k = wcrtomb (dest, *src, &st)) == (size_t) (-1)) break; @@ -119,7 +120,7 @@ static void my_wcstombs (char *dest, size_t dlen, const wchar_t * src, } } -size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf) +size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, const char *buf) { wchar_t wc; mbstate_t st; @@ -128,12 +129,12 @@ size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf) size_t wbuflen; wbuf = *pwbuf, wbuflen = *pwbuflen; - memset (&st, 0, sizeof (st)); + p_clear(&st, 1); for (; (k = mbrtowc (&wc, buf, MB_LEN_MAX, &st)) && k != (size_t) (-1) && k != (size_t) (-2); buf += k) { if (i >= wbuflen) { wbuflen = i + 20; - mem_realloc (&wbuf, wbuflen * sizeof (*wbuf)); + p_realloc(&wbuf, wbuflen); } wbuf[i++] = wc; } @@ -145,28 +146,28 @@ size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf) * Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF. */ -static void replace_part (ENTER_STATE * state, size_t from, char *buf) +static void replace_part (ENTER_STATE *state, size_t from, const char *buf) { /* Save the suffix */ size_t savelen = state->lastchar - state->curpos; - wchar_t *savebuf = mem_calloc (savelen, sizeof (wchar_t)); + wchar_t *savebuf = p_new(wchar_t, savelen); memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t)); /* Convert to wide characters */ - state->curpos = my_mbstowcs (&state->wbuf, &state->wbuflen, from, buf); + state->curpos = my_mbstowcs(&state->wbuf, &state->wbuflen, from, buf); /* Make space for suffix */ if (state->curpos + savelen > state->wbuflen) { state->wbuflen = state->curpos + savelen; - mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); + p_realloc(&state->wbuf, state->wbuflen); } /* Restore suffix */ memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t)); state->lastchar = state->curpos + savelen; - mem_free (&savebuf); + p_delete(&savebuf); } /* @@ -204,7 +205,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, int rv = 0; - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); if (state->wbuf) { /* Coming back after return 1 */ @@ -275,13 +276,13 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, switch (ch) { case OP_EDITOR_HISTORY_UP: state->curpos = state->lastchar; - replace_part (state, 0, mutt_history_prev (hclass)); + replace_part(state, 0, mutt_history_prev(hclass)); redraw = M_REDRAW_INIT; break; case OP_EDITOR_HISTORY_DOWN: state->curpos = state->lastchar; - replace_part (state, 0, mutt_history_next (hclass)); + replace_part(state, 0, mutt_history_next(hclass)); redraw = M_REDRAW_INIT; break; @@ -469,7 +470,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, } if (!mutt_complete (buf, buflen)) { templen = state->lastchar - i; - mem_realloc (&tempbuf, templen * sizeof (wchar_t)); + p_realloc(&tempbuf, templen); } else BEEP (); @@ -502,7 +503,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, goto bye; } else if (flags & M_COMMAND) { my_wcstombs (buf, buflen, state->wbuf, state->curpos); - i = str_len (buf); + i = m_strlen(buf); if (i && buf[i - 1] == '=' && mutt_var_value_complete (buf, buflen, i)) state->tabs = 0; @@ -537,7 +538,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, if (!mutt_complete (buf, buflen)) { templen = state->lastchar; - mem_realloc (&tempbuf, templen * sizeof (wchar_t)); + p_realloc(&tempbuf, templen); memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t)); } else @@ -615,7 +616,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, if (k == (size_t) (-2)) continue; else if (k && k != 1) { - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); continue; } } @@ -636,9 +637,9 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, char **tfiles; *numfiles = 1; - tfiles = mem_calloc (*numfiles, sizeof (char *)); + tfiles = p_new(char *, *numfiles); mutt_expand_path (buf, buflen); - tfiles[0] = str_dup (buf); + tfiles[0] = m_strdup(buf); *files = tfiles; } rv = 0; @@ -647,7 +648,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, else if (wc && (wc < ' ' || IsWPrint (wc))) { /* why? */ if (state->lastchar >= state->wbuflen) { state->wbuflen = state->lastchar + 20; - mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t)); + p_realloc(&state->wbuf, state->wbuflen); } memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos, (state->lastchar - state->curpos) * sizeof (wchar_t)); @@ -663,7 +664,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x, bye: - mem_free (&tempbuf); + p_delete(&tempbuf); return rv; } @@ -672,8 +673,8 @@ void mutt_free_enter_state (ENTER_STATE ** esp) if (!esp) return; - mem_free (&(*esp)->wbuf); - mem_free (esp); + p_delete(&(*esp)->wbuf); + p_delete(esp); } /*