X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=a7b385b91fabb8ff49ce0eddecc6e706dba3dbd9;hp=971f1975d35c295e024292363b9a32843ab34937;hb=f65ae399906906f734398432691dbacf2c7bda9f;hpb=97677c08933e16e25ecb3c12473ef1efdab7962b

diff --git a/remailer.c b/remailer.c
index 971f197..a7b385b 100644
--- a/remailer.c
+++ b/remailer.c
@@ -11,27 +11,9 @@
  * Mixmaster support for Mutt
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
 
@@ -48,14 +30,14 @@ struct coord {
   short r, c;
 };
 
-static REMAILER **mix_type2_list (size_t * l);
+static REMAILER **mix_type2_list (ssize_t * l);
 static REMAILER *mix_new_remailer (void);
 static const char *mix_format_caps (REMAILER * r);
 static int mix_chain_add (MIXCHAIN * chain, const char *s,
                           REMAILER ** type2_list);
 static int mix_get_caps (const char *capstr);
-static void mix_add_entry (REMAILER ***, REMAILER *, size_t *, size_t *);
-static void mix_entry (char *b, size_t blen, MUTTMENU * menu, int num);
+static void mix_add_entry (REMAILER ***, REMAILER *, ssize_t *, ssize_t *);
+static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num);
 static void mix_free_remailer (REMAILER ** r);
 static void mix_free_type2_list (REMAILER *** ttlp);
 static void mix_redraw_ce (REMAILER ** type2_list, struct coord *coords,
@@ -103,7 +85,7 @@ static int mix_get_caps (const char *capstr)
 }
 
 static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
-                           size_t * slots, size_t * used)
+                           ssize_t * slots, ssize_t * used)
 {
   if (*used == *slots) {
     *slots += 5;
@@ -131,7 +113,7 @@ static void mix_free_remailer (REMAILER ** r)
 
 /* parse the type2.list as given by mixmaster -T */
 
-static REMAILER **mix_type2_list (size_t * l)
+static REMAILER **mix_type2_list (ssize_t * l)
 {
   FILE *fp;
   pid_t mm_pid;
@@ -142,7 +124,7 @@ static REMAILER **mix_type2_list (size_t * l)
   char *t;
 
   REMAILER **type2_list = NULL, *p;
-  size_t slots = 0, used = 0;
+  ssize_t slots = 0, used = 0;
 
   if (!l)
     return NULL;
@@ -367,7 +349,7 @@ static const char *mix_format_caps (REMAILER * r)
  */
 
 static const char *mix_entry_fmt (char *dest,
-                                  size_t destlen,
+                                  ssize_t destlen,
                                   char op,
                                   const char *src,
                                   const char *prefix,
@@ -422,10 +404,10 @@ static const char *mix_entry_fmt (char *dest,
 
 
 
-static void mix_entry (char *b, size_t blen, MUTTMENU * menu, int num)
+static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
   REMAILER **type2_list = (REMAILER **) menu->data;
-  int w=(COLS-SW)>blen?blen:(COLS-SW);
+  int w = (COLS-SW) > blen ? blen : (COLS-SW);
 
   mutt_FormatString (b, w, NONULL (MixEntryFormat), mix_entry_fmt,
                      (unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR);
@@ -469,16 +451,16 @@ static struct mapping_t RemailerHelp[] = {
 };
 
 
-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;
   short c_redraw = 1;
 
   REMAILER **type2_list = NULL;
-  size_t ttll = 0;
+  ssize_t ttll = 0;
 
   struct coord *coords = NULL;
 
@@ -502,7 +484,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++) {
@@ -714,7 +696,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];