projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rationnalize includes a lot:
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
5b1c674
..
4551a3d
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-15,36
+15,26
@@
#define MAIN_C 1
#define MAIN_C 1
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <sys/utsname.h>
+
+#include <lib-sys/mutt_signal.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mutt.h"
+#include "alias.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
#include "keymap.h"
#include "keymap.h"
-#include "url.h"
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
@@
-65,11
+55,11
@@
extern int optind;
#endif
#ifdef USE_HCACHE
#endif
#ifdef USE_HCACHE
-#if
HAVE_QDBM
+#if
defined(HAVE_QDBM)
#include <depot.h>
#include <depot.h>
-#elif
HAVE_GDBM
+#elif
defined(HAVE_GDBM)
#include <gdbm.h>
#include <gdbm.h>
-#elif
HAVE_DB4
+#elif
defined(HAVE_DB4)
#include <db.h>
#endif
#endif
#include <db.h>
#endif
#endif
@@
-86,11
+76,6
@@
extern int optind;
#include <openssl/opensslv.h>
#endif
#include <openssl/opensslv.h>
#endif
-static const char *ReachingUs = N_("\
-To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
-To visit the Madmutt homepage go to http://www.muttng.org.\n\
-To report a bug, please use the fleang(1) utility.\n");
-
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
@@
-162,9
+147,6
@@
options:\n\
-a <file>\tattach a file to the message\n\
-b <address>\tspecify a blind carbon-copy (BCC) address\n\
-c <address>\tspecify a carbon-copy (CC) address");
-a <file>\tattach a file to the message\n\
-b <address>\tspecify a blind carbon-copy (BCC) address\n\
-c <address>\tspecify a carbon-copy (CC) address");
-#if DEBUG
- puts _(" -d <level>\tlog debugging output to ~/.madmuttdebug0");
-#endif
puts _("\
-e <command>\tspecify a command to be executed after initialization\n\
-f <file>\tspecify which mailbox to read\n\
puts _("\
-e <command>\tspecify a command to be executed after initialization\n\
-f <file>\tspecify which mailbox to read\n\
@@
-237,11
+219,11
@@
static void show_version (void)
#endif
#ifdef USE_HCACHE
#endif
#ifdef USE_HCACHE
-#if
HAVE_QDBM
+#if
defined(HAVE_QDBM)
printf (" qdbm %s\n", dpversion);
printf (" qdbm %s\n", dpversion);
-#elif
HAVE_GDBM
+#elif
defined(HAVE_GDBM)
printf (" gdbm %s\n", gdbm_version);
printf (" gdbm %s\n", gdbm_version);
-#elif
HAVE_DB4
+#elif
defined(HAVE_DB4)
printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
DB_VERSION_PATCH);
#endif
printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
DB_VERSION_PATCH);
#endif
@@
-261,12
+243,6
@@
static void show_version (void)
puts (_("Compile Options:"));
puts (_("Compile Options:"));
-#ifdef DEBUG
- puts (" +DEBUG");
-#else
- puts (" -DEBUG");
-#endif
-
puts (
#ifdef HOMESPOOL
" +HOMESPOOL "
puts (
#ifdef HOMESPOOL
" +HOMESPOOL "
@@
-335,11
+311,6
@@
static void show_version (void)
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
-#endif
-#ifdef USE_GNU_REGEX
- "+USE_GNU_REGEX "
-#else
- "-USE_GNU_REGEX "
#endif
"\n "
#ifdef HAVE_COLOR
#endif
"\n "
#ifdef HAVE_COLOR
@@
-413,27
+384,22
@@
static void show_version (void)
"-HAVE_LANGINFO_YESEXPR "
#endif
"\n "
"-HAVE_LANGINFO_YESEXPR "
#endif
"\n "
-#if HAVE_ICONV
+#if
def
HAVE_ICONV
"+HAVE_ICONV "
#else
"-HAVE_ICONV "
#endif
"+HAVE_ICONV "
#else
"-HAVE_ICONV "
#endif
-#if ICONV_NONTRANS
- "+ICONV_NONTRANS "
-#else
- "-ICONV_NONTRANS "
-#endif
-#if HAVE_LIBIDN
+#ifdef HAVE_LIBIDN
"+HAVE_LIBIDN "
#else
"-HAVE_LIBIDN "
#endif
"+HAVE_LIBIDN "
#else
"-HAVE_LIBIDN "
#endif
-#if HAVE_GETSID
+#if
def
HAVE_GETSID
"+HAVE_GETSID "
#else
"-HAVE_GETSID "
#endif
"+HAVE_GETSID "
#else
"-HAVE_GETSID "
#endif
-#if HAVE_GETADDRINFO
+#if
def
HAVE_GETADDRINFO
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
@@
-459,8
+425,6
@@
static void show_version (void)
puts (" -MIXMASTER\n");
#endif
puts (" -MIXMASTER\n");
#endif
- puts (_(ReachingUs));
-
puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
exit (0);
puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
exit (0);
@@
-477,25
+441,22
@@
static void start_curses (void)
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
- mutt_signal_init ();
+ mutt_signal_init
ialize
();
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
-#if 1 /* USE_SLANG_CURSES - commenting out suggested in #455. */
- /* slang requires the signal handlers to be set after initializing */
- mutt_signal_init ();
-#endif
+ mutt_signal_initialize ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
noecho ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
noecho ();
-#if HAVE_TYPEAHEAD
+#if
def
HAVE_TYPEAHEAD
typeahead (-1); /* simulate smooth scrolling */
#endif
typeahead (-1); /* simulate smooth scrolling */
#endif
-#if HAVE_META
+#if
def
HAVE_META
meta (stdscr, TRUE);
#endif
}
meta (stdscr, TRUE);
#endif
}
@@
-517,10
+478,10
@@
int main (int argc, char **argv)
char *draftFile = NULL;
char *newMagic = NULL;
HEADER *msg = NULL;
char *draftFile = NULL;
char *newMagic = NULL;
HEADER *msg = NULL;
-
LIST
*attach = NULL;
-
LIST
*commands = NULL;
-
LIST
*queries = NULL;
-
LIST
*alias_queries = NULL;
+
string_list_t
*attach = NULL;
+
string_list_t
*commands = NULL;
+
string_list_t
*queries = NULL;
+
string_list_t
*alias_queries = NULL;
int sendflags = 0;
int flags = 0;
int version = 0;
int sendflags = 0;
int flags = 0;
int version = 0;
@@
-529,7
+490,7
@@
int main (int argc, char **argv)
int dump_variables = -1;
/* initialize random number for tmp file creation */
int dump_variables = -1;
/* initialize random number for tmp file creation */
- srand
((unsigned int) time (NULL));
+ srand
48
((unsigned int) time (NULL));
/* sanity check against stupid administrators */
/* sanity check against stupid administrators */
@@
-549,19
+510,19
@@
int main (int argc, char **argv)
mutt_error = mutt_nocurses_error;
mutt_message = mutt_nocurses_error;
mutt_error = mutt_nocurses_error;
mutt_message = mutt_nocurses_error;
-
SRAND
(time (NULL));
+
srand48
(time (NULL));
umask (077);
umask (077);
- p_clear(Options,
size
of(Options));
- p_clear(QuadOptions,
size
of(QuadOptions));
+ p_clear(Options,
count
of(Options));
+ p_clear(QuadOptions,
count
of(QuadOptions));
#ifdef USE_NNTP
while ((i =
getopt (argc, argv,
#ifdef USE_NNTP
while ((i =
getopt (argc, argv,
- "A:a:b:F:f:c:
d:
e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
+ "A:a:b:F:f:c:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
#else
while ((i =
#else
while ((i =
- getopt (argc, argv, "A:a:b:F:f:c:
d:
e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
+ getopt (argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
#endif
switch (i) {
case 'A':
#endif
switch (i) {
case 'A':
@@
-597,17
+558,6
@@
int main (int argc, char **argv)
msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg);
break;
msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg);
break;
- case 'd':
- {
- char buf[LONG_STRING];
- int level = atoi (optarg);
-
- snprintf (buf, sizeof (buf), "set debug_level=%d", level);
- commands = mutt_add_list (commands, buf);
- debug_setlevel (level);
- }
- break;
-
case 't':
dump_variables = 2;
break;
case 't':
dump_variables = 2;
break;
@@
-700,7
+650,6
@@
int main (int argc, char **argv)
puts (_(Copyright_GPL_1));
puts (_(Copyright_GPL_2));
puts (_(Copyright_GPL_3));
puts (_(Copyright_GPL_1));
puts (_(Copyright_GPL_2));
puts (_(Copyright_GPL_3));
- puts (_(ReachingUs));
exit (0);
}
exit (0);
}
@@
-718,7
+667,7
@@
int main (int argc, char **argv)
/* set defaults and read init files */
mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
/* set defaults and read init files */
mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
-
mutt_free_list
(&commands);
+
string_list_wipe
(&commands);
/* Initialize crypto */
crypt_init ();
/* Initialize crypto */
crypt_init ();
@@
-733,12
+682,12
@@
int main (int argc, char **argv)
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
- if ((a =
mutt_lookup_alias (alias_queries->data
))) {
+ if ((a =
address_list_dup(alias_lookup(alias_queries->data)
))) {
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);
- }
- else {
+ address_list_wipe(&a);
+
}
else {
rv = 1;
printf ("%s\n", alias_queries->data);
}
rv = 1;
printf ("%s\n", alias_queries->data);
}
@@
-874,7
+823,7
@@
int main (int argc, char **argv)
p_delete(&bodytext);
if (attach) {
p_delete(&bodytext);
if (attach) {
-
LIST
*t = attach;
+
string_list_t
*t = attach;
BODY *a = NULL;
while (t) {
BODY *a = NULL;
while (t) {
@@
-888,12
+837,12
@@
int main (int argc, char **argv)
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
-
mutt_free_list
(&attach);
+
string_list_wipe
(&attach);
exit (1);
}
t = t->next;
}
exit (1);
}
t = t->next;
}
-
mutt_free_list
(&attach);
+
string_list_wipe
(&attach);
}
ci_send_message (sendflags, msg, tempfile, NULL, NULL);
}
ci_send_message (sendflags, msg, tempfile, NULL, NULL);