projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
enter.c
diff --git
a/enter.c
b/enter.c
index
cd98df9
..
7cd96dc
100644
(file)
--- a/
enter.c
+++ b/
enter.c
@@
-13,6
+13,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "enter.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-132,7
+133,7
@@
size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf)
k != (size_t) (-1) && k != (size_t) (-2); buf += k) {
if (i >= wbuflen) {
wbuflen = i + 20;
k != (size_t) (-1) && k != (size_t) (-2); buf += k) {
if (i >= wbuflen) {
wbuflen = i + 20;
-
safe
_realloc (&wbuf, wbuflen * sizeof (*wbuf));
+
mem
_realloc (&wbuf, wbuflen * sizeof (*wbuf));
}
wbuf[i++] = wc;
}
}
wbuf[i++] = wc;
}
@@
-148,7
+149,7
@@
static void replace_part (ENTER_STATE * state, size_t from, char *buf)
{
/* Save the suffix */
size_t savelen = state->lastchar - state->curpos;
{
/* Save the suffix */
size_t savelen = state->lastchar - state->curpos;
- wchar_t *savebuf =
safe
_calloc (savelen, sizeof (wchar_t));
+ wchar_t *savebuf =
mem
_calloc (savelen, sizeof (wchar_t));
memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
@@
-158,14
+159,14
@@
static void replace_part (ENTER_STATE * state, size_t from, char *buf)
/* Make space for suffix */
if (state->curpos + savelen > state->wbuflen) {
state->wbuflen = state->curpos + savelen;
/* Make space for suffix */
if (state->curpos + savelen > state->wbuflen) {
state->wbuflen = state->curpos + savelen;
-
safe
_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+
mem
_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
}
/* Restore suffix */
memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
state->lastchar = state->curpos + savelen;
}
/* Restore suffix */
memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
state->lastchar = state->curpos + savelen;
-
FREE
(&savebuf);
+
mem_free
(&savebuf);
}
/*
}
/*
@@
-468,7
+469,7
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
}
if (!mutt_complete (buf, buflen)) {
templen = state->lastchar - i;
}
if (!mutt_complete (buf, buflen)) {
templen = state->lastchar - i;
-
safe
_realloc (&tempbuf, templen * sizeof (wchar_t));
+
mem
_realloc (&tempbuf, templen * sizeof (wchar_t));
}
else
BEEP ();
}
else
BEEP ();
@@
-501,7
+502,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);
goto bye;
} else if (flags & M_COMMAND) {
my_wcstombs (buf, buflen, state->wbuf, state->curpos);
- i =
mutt_str
len (buf);
+ i =
str_
len (buf);
if (i && buf[i - 1] == '=' &&
mutt_var_value_complete (buf, buflen, i))
state->tabs = 0;
if (i && buf[i - 1] == '=' &&
mutt_var_value_complete (buf, buflen, i))
state->tabs = 0;
@@
-536,7
+537,7
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
if (!mutt_complete (buf, buflen)) {
templen = state->lastchar;
if (!mutt_complete (buf, buflen)) {
templen = state->lastchar;
-
safe
_realloc (&tempbuf, templen * sizeof (wchar_t));
+
mem
_realloc (&tempbuf, templen * sizeof (wchar_t));
memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
}
else
memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
}
else
@@
-635,9
+636,9
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
char **tfiles;
*numfiles = 1;
char **tfiles;
*numfiles = 1;
- tfiles =
safe
_calloc (*numfiles, sizeof (char *));
+ tfiles =
mem
_calloc (*numfiles, sizeof (char *));
mutt_expand_path (buf, buflen);
mutt_expand_path (buf, buflen);
- tfiles[0] = s
afe_str
dup (buf);
+ tfiles[0] = s
tr_
dup (buf);
*files = tfiles;
}
rv = 0;
*files = tfiles;
}
rv = 0;
@@
-646,7
+647,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;
else if (wc && (wc < ' ' || IsWPrint (wc))) { /* why? */
if (state->lastchar >= state->wbuflen) {
state->wbuflen = state->lastchar + 20;
-
safe
_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+
mem
_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
}
memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos,
(state->lastchar - state->curpos) * sizeof (wchar_t));
}
memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos,
(state->lastchar - state->curpos) * sizeof (wchar_t));
@@
-662,7
+663,7
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
bye:
bye:
-
FREE
(&tempbuf);
+
mem_free
(&tempbuf);
return rv;
}
return rv;
}
@@
-671,8
+672,8
@@
void mutt_free_enter_state (ENTER_STATE ** esp)
if (!esp)
return;
if (!esp)
return;
-
FREE
(&(*esp)->wbuf);
-
FREE
(esp);
+
mem_free
(&(*esp)->wbuf);
+
mem_free
(esp);
}
/*
}
/*