X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=edit.c;h=07bc98d44d9d2fbd3d7b23e7ed3c7542f7bc0b9a;hp=8a55fee001edf2f81c5b7c7249e77fb415d842e6;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/edit.c b/edit.c index 8a55fee..07bc98d 100644 --- a/edit.c +++ b/edit.c @@ -13,10 +13,18 @@ # include "config.h" #endif +#include +#include +#include +#include +#include + #include "mutt.h" +#include "enter.h" #include "mutt_curses.h" #include "mutt_idna.h" + #include #include #include @@ -29,7 +37,7 @@ * SLcurses_waddnstr() can't take a "const char *", so this is only * declared "static" (sigh) */ -static char *EditorHelp = N_("\ +static const char *EditorHelp = N_("\ ~~ insert a line begining with a single ~\n\ ~b users add users to the Bcc: field\n\ ~c users add users to the Cc: field\n\ @@ -50,7 +58,7 @@ static char *EditorHelp = N_("\ . on a line by itself ends input\n"); static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen, - int offset, int bytes, int prefix) + off_t offset, int bytes, int prefix) { char tmp[HUGE_STRING]; char *p = tmp; @@ -59,22 +67,22 @@ static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen, tmp[sizeof (tmp) - 1] = 0; if (prefix) { strfcpy (tmp, NONULL (Prefix), sizeof (tmp)); - tmplen = mutt_strlen (tmp); + tmplen = m_strlen(tmp); p = tmp + tmplen; tmplen = sizeof (tmp) - tmplen; } - fseek (f, offset, 0); + fseeko (f, offset, 0); while (bytes > 0) { if (fgets (p, tmplen - 1, f) == NULL) break; - bytes -= mutt_strlen (p); + bytes -= m_strlen(p); if (*bufmax == *buflen) - safe_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = safe_strdup (tmp); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup(tmp); } if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */ - safe_realloc (&buf, sizeof (char *) * (++*bufmax)); + p_realloc(&buf, ++*bufmax); } if (buf) buf[*buflen] = NULL; @@ -126,9 +134,9 @@ static int be_barf_file (const char *path, char **buf, int buflen) static void be_free_memory (char **buf, int buflen) { while (buflen-- > 0) - FREE (&buf[buflen]); + p_delete(&buf[buflen]); if (buf) - FREE (&buf); + p_delete(&buf); } static char **be_include_messages (char *msg, char **buf, int *bufmax, @@ -150,8 +158,8 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax, } if (*bufmax == *buflen) - safe_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = safe_strdup (tmp); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup(tmp); bytes = Context->hdrs[n]->content->length; if (inc_hdrs) { @@ -164,8 +172,8 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax, pfx); if (*bufmax == *buflen) - safe_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = safe_strdup ("\n"); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup("\n"); } else printw (_("%d: invalid message number.\n"), n); @@ -241,7 +249,7 @@ static void be_edit_header (ENVELOPE * e, int force) addstr ("Subject: "); strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp)); if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0) - mutt_str_replace (&e->subject, tmp); + str_replace (&e->subject, tmp); addch ('\n'); } @@ -312,7 +320,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) if (EscChar && tmp[0] == EscChar[0] && tmp[1] != EscChar[0]) { /* remove trailing whitespace from the line */ - p = tmp + mutt_strlen (tmp) - 1; + p = tmp + m_strlen(tmp) - 1; while (p >= tmp && ISSPACE (*p)) *p-- = 0; @@ -341,9 +349,9 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) if (Context) { if (!*p && cur) { /* include the current message */ - p = tmp + mutt_strlen (tmp) + 1; - snprintf (tmp + mutt_strlen (tmp), - sizeof (tmp) - mutt_strlen (tmp), " %d", + p = tmp + m_strlen(tmp) + 1; + snprintf (tmp + m_strlen(tmp), + sizeof (tmp) - m_strlen(tmp), " %d", cur->msgno + 1); } buf = be_include_messages (p, buf, &bufmax, &buflen, @@ -375,7 +383,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) addstr (_("missing filename.\n")); break; case 's': - mutt_str_replace (&msg->env->subject, p); + str_replace (&msg->env->subject, p); break; case 't': msg->env->to = rfc822_parse_adrlist (msg->env->to, p); @@ -385,8 +393,8 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) if (buflen) { buflen--; strfcpy (tmp, buf[buflen], sizeof (tmp)); - tmp[mutt_strlen (tmp) - 1] = 0; - FREE (&buf[buflen]); + tmp[m_strlen(tmp) - 1] = 0; + p_delete(&buf[buflen]); buf[buflen] = NULL; continue; } @@ -397,7 +405,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) case 'e': case 'v': if (be_barf_file (path, buf, buflen) == 0) { - char *tag, *err; + const char *tag, *err; be_free_memory (buf, buflen); buf = NULL; @@ -429,13 +437,13 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) break; } } - else if (mutt_strcmp (".", tmp) == 0) + else if (m_strcmp(".", tmp) == 0) done = 1; else { - safe_strcat (tmp, sizeof (tmp), "\n"); + str_cat (tmp, sizeof (tmp), "\n"); if (buflen == bufmax) - safe_realloc (&buf, sizeof (char *) * (bufmax += 25)); - buf[buflen++] = safe_strdup (tmp[1] == '~' ? tmp + 1 : tmp); + p_realloc(&buf, bufmax += 25); + buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp); } tmp[0] = 0;