properly rewrite body_to_data_object: we must _add_ CR's not remove them :P

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 6e68f53..72e6737 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -15,7 +15,6 @@
 
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
@@ -24,6 +23,7 @@
 
 #include "mutt.h"
 #include "alias.h"
+#include "crypt.h"
 #include "mutt_idna.h"
 #include "attach.h"
 #include "recvattach.h"
@@ -113,10 +113,9 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
-  int w=(COLS-SW)>blen?blen:COLS-SW;
-  mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
-                     (unsigned long) (((ATTACHPTR **) menu->data)[num]),
-                     M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
+  m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+              ((ATTACHPTR **)menu->data)[num],
+              M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
 }
 
 static void redraw_crypt_lines (HEADER * msg)
@@ -201,7 +200,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen)
 {
   int i, r;
   struct stat st;
-  char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING];
+  char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING];
 
   for (i = 0; i < idxlen; i++) {
     m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
@@ -231,7 +230,7 @@ static void draw_envelope_addr (int line, address_t * addr)
   char buf[STRING];
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), addr, 1);
   mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
 }
@@ -281,7 +280,7 @@ static int edit_address_list (int line, address_t ** addr)
   char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
-  rfc822_write_address (buf, sizeof (buf), *addr, 0);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
     address_list_wipe(addr);
     *addr = mutt_parse_adrlist (*addr, buf);
@@ -301,7 +300,7 @@ static int edit_address_list (int line, address_t ** addr)
 
   /* redraw the expanded list so the user can see the result */
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), *addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 1);
   move (line, HDR_XOFFSET + SW);
   mutt_paddstr (W, buf);
 
@@ -410,13 +409,13 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
 
 static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *src, const char *prefix,
-                                       const char *ifstring,
-                                       const char *elsestring,
-                                       unsigned long data, format_flag flags)
+                                       const char *ifstr,
+                                       const char *elstr,
+                                       anytype data, format_flag flags)
 {
-  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  char fmt[STRING], tmp[STRING];
   int optional = (flags & M_FORMAT_OPTIONAL);
-  MUTTMENU *menu = (MUTTMENU *) data;
+  MUTTMENU *menu = data.ptr;
 
   *buf = 0;
   switch (op) {
@@ -427,7 +426,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 
   case 'h':                    /* hostname */
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-    snprintf (buf, buflen, fmt, NONULL (Hostname));
+    snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
     break;
 
   case 'l':                    /* approx length of current message in bytes */
@@ -437,7 +436,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     break;
 
   case 'v':
-    m_strcpy(buf, buflen, mutt_make_version (0));
+    m_strcpy(buf, buflen, mutt_make_version());
     break;
 
   case 0:
@@ -445,14 +444,12 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     return (src);
 
   default:
-    snprintf (buf, buflen, "%%%s%c", prefix, op);
+    *buf = 0;
     break;
   }
 
-  if (optional)
-    compose_status_line (buf, buflen, menu, ifstring);
-  else if (flags & M_FORMAT_OPTIONAL)
-    compose_status_line (buf, buflen, menu, elsestring);
+  if (flags & M_FORMAT_OPTIONAL)
+    compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
 
   return (src);
 }
@@ -460,9 +457,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
                                  const char *p)
 {
-  int w=(COLS-SW)>buflen?buflen:(COLS-SW);
-  mutt_FormatString (buf, w, p, compose_format_str,
-                     (unsigned long) menu, 0);
+    m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0);
 }
 
 /* return values:
@@ -476,7 +471,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                        ssize_t fcclen,
                        HEADER * cur __attribute__ ((unused)))
 {                               /* current message */
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   char buf[LONG_STRING];
   char fname[_POSIX_PATH_MAX];
   MUTTMENU *menu;
@@ -652,8 +647,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
     case OP_COMPOSE_EDIT_MESSAGE:
-      if (Editor && !option (OPTEDITHDRS)) {
-        mutt_edit_file (Editor, msg->content->filename);
+      if (!option (OPTEDITHDRS)) {
+        mutt_edit_file(msg->content->filename);
         mutt_update_encoding (msg->content);
         menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         mutt_message_hook (NULL, msg, M_SEND2HOOK);
@@ -667,8 +662,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         char *err = NULL;
 
         mutt_env_to_local (msg->env);
-        mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
-                           fcc, fcclen);
+        mutt_edit_headers(msg->content->filename, msg, fcc, fcclen);
         if (mutt_env_to_idna (msg->env, &tag, &err)) {
           mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
           p_delete(&err);
@@ -692,31 +686,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break; 
 
-    case OP_COMPOSE_ATTACH_KEY:
-      if (idxlen == idxmax) {
-        p_realloc(&idx, idxmax += 5);
-        menu->data = idx;
-      }
-
-      idx[idxlen] = p_new(ATTACHPTR, 1);
-      if ((idx[idxlen]->content =
-           crypt_pgp_make_key_attachment (NULL)) != NULL) {
-        update_idx (menu, idx, idxlen++);
-        menu->redraw |= REDRAW_INDEX;
-      }
-      else
-        p_delete(&idx[idxlen]);
-
-      menu->redraw |= REDRAW_STATUS;
-
-      if (option (OPTNEEDREDRAW)) {
-        menu->redraw = REDRAW_FULL;
-        unset_option (OPTNEEDREDRAW);
-      }
-
-      mutt_message_hook (NULL, msg, M_SEND2HOOK);
-      break; 
-
     case OP_COMPOSE_ATTACH_FILE:
       {
         char *prompt, **files;
@@ -1028,7 +997,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
     case OP_COMPOSE_EDIT_FILE:
       CHECK_COUNT;
-      mutt_edit_file (NONULL (Editor), idx[menu->current]->content->filename);
+      mutt_edit_file(idx[menu->current]->content->filename);
       mutt_update_encoding (idx[menu->current]->content);
       menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
@@ -1236,20 +1205,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       r = 1;
       break;
 
-    case OP_COMPOSE_ISPELL:
-      endwin ();
-      snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell),
-                msg->content->filename);
-      if (mutt_system (buf) == -1)
-        mutt_error (_("Error running \"%s\"!"), buf);
-      else {
-        mutt_update_encoding (msg->content);
-        menu->redraw |= REDRAW_STATUS;
-      }
-      break;
-
     case OP_COMPOSE_WRITE_MESSAGE:
-
       fname[0] = '\0';
       if (Context) {
         m_strcpy(fname, sizeof(fname), NONULL(Context->path));
@@ -1282,15 +1238,11 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         msg->security = 0;
       }
-      msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
+      msg->security = crypt_send_menu (msg, &menu->redraw, 0);
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
 
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_COMPOSE_SMIME_MENU:
       if (msg->security & APPLICATION_PGP) {
         if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
@@ -1300,7 +1252,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         msg->security = 0;
       }
-      msg->security = crypt_smime_send_menu (msg, &menu->redraw);
+      msg->security = crypt_send_menu(msg, &menu->redraw, 1);
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;