projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop list2_t from sendlib.c as well.
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
d60048b
..
a7b385b
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-11,17
+11,9
@@
* Mixmaster support for Mutt
*/
* Mixmaster support for Mutt
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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/lib-lib.h>
+#include <lib-sys/unix.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
@@
-30,16
+22,6
@@
#include "remailer.h"
#include "remailer.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>
-
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#ifdef MIXMASTER
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#ifdef MIXMASTER
@@
-48,14
+30,14
@@
struct coord {
short r, c;
};
short r, c;
};
-static REMAILER **mix_type2_list (size_t * l);
+static REMAILER **mix_type2_list (s
s
ize_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 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 *, s
ize_t *,
size_t *);
-static void mix_entry (char *b, size_t blen, MUTTMENU * menu, int num);
+static void mix_add_entry (REMAILER ***, REMAILER *, s
size_t *, s
size_t *);
+static void mix_entry (char *b, s
s
ize_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,
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,
}
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
- s
ize_t * slots,
size_t * used)
+ s
size_t * slots, s
size_t * used)
{
if (*used == *slots) {
*slots += 5;
{
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 */
/* parse the type2.list as given by mixmaster -T */
-static REMAILER **mix_type2_list (size_t * l)
+static REMAILER **mix_type2_list (s
s
ize_t * l)
{
FILE *fp;
pid_t mm_pid;
{
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;
char *t;
REMAILER **type2_list = NULL, *p;
- size_t slots = 0, used = 0;
+ s
s
ize_t slots = 0, used = 0;
if (!l)
return NULL;
if (!l)
return NULL;
@@
-367,7
+349,7
@@
static const char *mix_format_caps (REMAILER * r)
*/
static const char *mix_entry_fmt (char *dest,
*/
static const char *mix_entry_fmt (char *dest,
- size_t destlen,
+ s
s
ize_t destlen,
char op,
const char *src,
const char *prefix,
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, s
s
ize_t blen, MUTTMENU * menu, int num)
{
REMAILER **type2_list = (REMAILER **) menu->data;
{
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);
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;
MIXCHAIN *chain;
int c_cur = 0, c_old = 0;
int m_len;
short c_redraw = 1;
REMAILER **type2_list = NULL;
- size_t ttll = 0;
+ s
s
ize_t ttll = 0;
struct coord *coords = NULL;
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);
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++) {
/* safety check */
for (i = 0; i < chain->cl; i++) {
@@
-714,7
+696,7
@@
int mix_check_message (HEADER * msg)
return 0;
}
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];
{
char cmd[HUGE_STRING];
char tmp[HUGE_STRING];