X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=edit.c;h=d4bcc68330353a671d1d0182756040bddc59cf19;hp=88eeca369f6f1eac85fa3a8f73cbb2a8af449fc3;hb=ab12fea9d01b3b9bc53081ae4ccc046243f1cb9f;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/edit.c b/edit.c index 88eeca3..d4bcc68 100644 --- a/edit.c +++ b/edit.c @@ -13,13 +13,17 @@ # include "config.h" #endif +#include +#include +#include +#include +#include + #include "mutt.h" +#include "enter.h" #include "mutt_curses.h" #include "mutt_idna.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include #include @@ -33,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\ @@ -54,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; @@ -62,23 +66,23 @@ 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 = str_len (tmp); + m_strcpy(tmp, sizeof(tmp), NONULL(Prefix)); + 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 -= str_len (p); + bytes -= m_strlen(p); if (*bufmax == *buflen) - mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = str_dup (tmp); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup(tmp); } if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */ - mem_realloc (&buf, sizeof (char *) * (++*bufmax)); + p_realloc(&buf, ++*bufmax); } if (buf) buf[*buflen] = NULL; @@ -130,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) - mem_free (&buf[buflen]); + p_delete(&buf[buflen]); if (buf) - mem_free (&buf); + p_delete(&buf); } static char **be_include_messages (char *msg, char **buf, int *bufmax, @@ -154,8 +158,8 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax, } if (*bufmax == *buflen) - mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = str_dup (tmp); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup(tmp); bytes = Context->hdrs[n]->content->length; if (inc_hdrs) { @@ -168,8 +172,8 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax, pfx); if (*bufmax == *buflen) - mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)); - buf[(*buflen)++] = str_dup ("\n"); + p_realloc(&buf, *bufmax += 25); + buf[(*buflen)++] = m_strdup("\n"); } else printw (_("%d: invalid message number.\n"), n); @@ -243,7 +247,7 @@ static void be_edit_header (ENVELOPE * e, int force) if (!e->subject || force) { addstr ("Subject: "); - strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp)); + m_strcpy(tmp, sizeof(tmp), NONULL(e->subject)); if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0) str_replace (&e->subject, tmp); addch ('\n'); @@ -316,12 +320,11 @@ 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 + str_len (tmp) - 1; + p = tmp + m_strlen(tmp) - 1; while (p >= tmp && ISSPACE (*p)) *p-- = 0; - p = tmp + 2; - SKIPWS (p); + p = vskipspaces(tmp + 2); switch (tmp[1]) { case '?': @@ -345,9 +348,9 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) if (Context) { if (!*p && cur) { /* include the current message */ - p = tmp + str_len (tmp) + 1; - snprintf (tmp + str_len (tmp), - sizeof (tmp) - str_len (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, @@ -371,7 +374,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) break; case 'r': if (*p) { - strncpy (tmp, p, sizeof (tmp)); + m_strcpy(tmp, sizeof(tmp), p); mutt_expand_path (tmp, sizeof (tmp)); buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1); } @@ -388,9 +391,9 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) case 'u': if (buflen) { buflen--; - strfcpy (tmp, buf[buflen], sizeof (tmp)); - tmp[str_len (tmp) - 1] = 0; - mem_free (&buf[buflen]); + m_strcpy(tmp, sizeof(tmp), buf[buflen]); + tmp[m_strlen(tmp) - 1] = 0; + p_delete(&buf[buflen]); buf[buflen] = NULL; continue; } @@ -401,7 +404,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; @@ -433,13 +436,13 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur) break; } } - else if (str_cmp (".", tmp) == 0) + else if (m_strcmp(".", tmp) == 0) done = 1; else { - str_cat (tmp, sizeof (tmp), "\n"); + m_strcat(tmp, sizeof(tmp), "\n"); if (buflen == bufmax) - mem_realloc (&buf, sizeof (char *) * (bufmax += 25)); - buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp); + p_realloc(&buf, bufmax += 25); + buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp); } tmp[0] = 0;