not having wide chars is soooo 90, please, I *really* don't care with

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index b542209..b40ddbb 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -15,28 +15,31 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/mem.h>
-
-#include "mutt.h"
-#include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "mapping.h"
-
-#include "remailer.h"
-
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/rx.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-
 #include <sys/types.h>
 #include <sys/file.h>
 #include <fcntl.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+#include <lib-lib/rx.h>
+
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
+#include "mutt.h"
+#include "recvattach.h"
+
+#include "remailer.h"
+
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
 #ifdef MIXMASTER
@@ -159,7 +162,7 @@ static REMAILER **mix_type2_list (size_t * l)
   /* first, generate the "random" remailer */
 
   p = mix_new_remailer ();
-  p->shortname = str_dup ("<random>");
+  p->shortname = m_strdup("<random>");
   mix_add_entry (&type2_list, p, &slots, &used);
 
   while (fgets (line, sizeof (line), fp)) {
@@ -168,12 +171,12 @@ static REMAILER **mix_type2_list (size_t * l)
     if (!(t = strtok (line, " \t\n")))
       goto problem;
 
-    p->shortname = str_dup (t);
+    p->shortname = m_strdup(t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
 
-    p->addr = str_dup (t);
+    p->addr = m_strdup(t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
@@ -181,7 +184,7 @@ static REMAILER **mix_type2_list (size_t * l)
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
 
-    p->ver = str_dup (t);
+    p->ver = m_strdup(t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
@@ -238,7 +241,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   if (i) {
     c =
-      coords[i - 1].c + str_len (type2_list[chain->ch[i - 1]]->shortname) + 2;
+      coords[i - 1].c + m_strlen(type2_list[chain->ch[i - 1]]->shortname) + 2;
     r = coords[i - 1].r;
   }
   else {
@@ -249,7 +252,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   for (; i < chain->cl; i++) {
     oc = c;
-    c += str_len (type2_list[chain->ch[i]]->shortname) + 2;
+    c += m_strlen(type2_list[chain->ch[i]]->shortname) + 2;
 
     if (c >= COLS) {
       oc = c = MIX_HOFFSET;
@@ -436,7 +439,7 @@ static int mix_chain_add (MIXCHAIN * chain, const char *s,
   if (chain->cl >= MAXMIXES)
     return -1;
 
-  if (!str_cmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
+  if (!m_strcmp(s, "0") || !ascii_strcasecmp (s, "<random>")) {
     chain->ch[chain->cl++] = 0;
     return 0;
   }
@@ -462,13 +465,13 @@ static struct mapping_t RemailerHelp[] = {
   {N_("Delete"), OP_MIX_DELETE},
   {N_("Abort"), OP_EXIT},
   {N_("OK"), OP_MIX_USE},
-  {NULL}
+  {NULL, OP_NULL}
 };
 
 
-void mix_make_chain (LIST ** chainp, int *redraw)
+void mix_make_chain (string_list_t ** chainp, int *redraw)
 {
-  LIST *p;
+  string_list_t *p;
   MIXCHAIN *chain;
   int c_cur = 0, c_old = 0;
   int m_len;
@@ -499,7 +502,7 @@ void mix_make_chain (LIST ** chainp, int *redraw)
   for (p = *chainp; p; p = p->next)
     mix_chain_add (chain, (char *) p->data, type2_list);
 
-  mutt_free_list (chainp);
+  string_list_wipe(chainp);
 
   /* safety check */
   for (i = 0; i < chain->cl; i++) {
@@ -672,7 +675,7 @@ int mix_check_message (HEADER * msg)
 {
   const char *fqdn;
   short need_hostname = 0;
-  ADDRESS *p;
+  address_t *p;
 
   if (msg->env->cc || msg->env->bcc) {
     mutt_error _("Mixmaster doesn't accept Cc or Bcc headers.");
@@ -711,7 +714,7 @@ int mix_check_message (HEADER * msg)
   return 0;
 }
 
-int mix_send_message (LIST * chain, const char *tempfile)
+int mix_send_message (string_list_t * chain, const char *tempfile)
 {
   char cmd[HUGE_STRING];
   char tmp[HUGE_STRING];
@@ -721,7 +724,7 @@ int mix_send_message (LIST * chain, const char *tempfile)
   snprintf (cmd, sizeof (cmd), "cat %s | %s -m ", tempfile, Mixmaster);
 
   for (i = 0; chain; chain = chain->next, i = 1) {
-    strfcpy (tmp, cmd, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), cmd);
     mutt_quote_filename (cd_quoted, sizeof (cd_quoted), (char *) chain->data);
     snprintf (cmd, sizeof (cmd), "%s%s%s", tmp, i ? "," : " -l ", cd_quoted);
   }