projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
not having wide chars is soooo 90, please, I *really* don't care with
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
30148f0
..
e3a0b83
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-19,32
+19,36
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
+
+#include <lib-sys/mutt_signal.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#include "mutt.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
@@
-86,14
+90,9
@@
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 Mutt-ng 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\
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-M
utt-ng
comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
+M
admutt
comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
Mutt is free software, and you are welcome to redistribute it\n\
under certain conditions; type `madmutt -vv' for details.\n");
Mutt is free software, and you are welcome to redistribute it\n\
under certain conditions; type `madmutt -vv' for details.\n");
@@
-172,11
+171,11
@@
options:\n\
-g <server>\tspecify a newsserver (if compiled with NNTP)\n\
-G\t\tselect a newsgroup (if compiled with NNTP)\n\
-H <file>\tspecify a draft file to read header and body from\n\
-g <server>\tspecify a newsserver (if compiled with NNTP)\n\
-G\t\tselect a newsgroup (if compiled with NNTP)\n\
-H <file>\tspecify a draft file to read header and body from\n\
- -i <file>\tspecify a file which M
utt-ng
should include in the body");
+ -i <file>\tspecify a file which M
admutt
should include in the body");
puts _("\
puts _("\
- -d <level>\t specify debugging level of M
utt-ng
\n\
+ -d <level>\t specify debugging level of M
admutt
\n\
-m <type>\tspecify a default mailbox type\n\
-m <type>\tspecify a default mailbox type\n\
- -n\t\tcauses M
utt-ng not to read the system Muttng
rc\n\
+ -n\t\tcauses M
admutt not to read the system Madmutt
rc\n\
-p\t\trecall a postponed message\n\
-Q <variable>\tquery a configuration variable\n\
-R\t\topen mailbox in read-only mode\n\
-p\t\trecall a postponed message\n\
-Q <variable>\tquery a configuration variable\n\
-R\t\topen mailbox in read-only mode\n\
@@
-335,11
+334,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
@@
-459,9
+453,7
@@
static void show_version (void)
puts (" -MIXMASTER\n");
#endif
puts (" -MIXMASTER\n");
#endif
- puts (_(ReachingUs));
-
- puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
+ puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
exit (0);
}
exit (0);
}
@@
-477,17
+469,14
@@
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 ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
@@
-517,10
+506,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;
@@
-552,8
+541,8
@@
int main (int argc, char **argv)
SRAND (time (NULL));
umask (077);
SRAND (time (NULL));
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 =
#ifdef USE_NNTP
while ((i =
@@
-700,7
+689,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
+706,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,7
+721,7
@@
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 =
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);
@@
-874,7
+862,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
+876,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);