projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use signed size parameter in quote_entry()
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d604a54
..
9cf0437
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-19,17
+19,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.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 "url.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
-#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-42,6
+47,9
@@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#endif
#ifdef HAVE_LIBIDN
@@
-56,7
+64,7
@@
#include <libesmtp.h>
#endif
#include <libesmtp.h>
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
@@
-74,6
+82,10
@@
#include <gpgme.h>
#endif
#include <gpgme.h>
#endif
+#ifdef USE_SSL
+#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\
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\
@@
-173,7
+185,6
@@
options:\n\
-t\t\tprint the value of all variables to stdout\n\
-T\t\tprint the value of all changed variables to stdout\n\
-v\t\tshow version and compile-time definitions\n\
-t\t\tprint the value of all variables to stdout\n\
-T\t\tprint the value of all changed variables to stdout\n\
-v\t\tshow version and compile-time definitions\n\
- -x\t\tsimulate the mailx send mode\n\
-y\t\tselect a mailbox specified in your `mailboxes' list\n\
-z\t\texit immediately if there are no messages in the mailbox\n\
-Z\t\topen the first folder with new message, exit immediately if none\n\
-y\t\tselect a mailbox specified in your `mailboxes' list\n\
-z\t\texit immediately if there are no messages in the mailbox\n\
-Z\t\topen the first folder with new message, exit immediately if none\n\
@@
-225,7
+236,7
@@
static void show_version (void)
printf (" libESMTP %s\n", buf);
#endif
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
@@
-240,6
+251,10
@@
static void show_version (void)
printf (" gnutls %s\n", LIBGNUTLS_VERSION);
#endif
printf (" gnutls %s\n", LIBGNUTLS_VERSION);
#endif
+#ifdef USE_SSL
+ printf (" %s\n",OPENSSL_VERSION_TEXT);
+#endif
+
#ifdef CRYPT_BACKEND_GPGME
printf (" gpgme %s\n", GPGME_VERSION);
#endif
#ifdef CRYPT_BACKEND_GPGME
printf (" gpgme %s\n", GPGME_VERSION);
#endif
@@
-268,12
+283,6
@@
static void show_version (void)
#else
"-USE_DOTLOCK "
#endif
#else
"-USE_DOTLOCK "
#endif
-#ifdef DL_STANDALONE
- "+DL_STANDALONE "
-#else
- "-DL_STANDALONE "
-#endif
- "\n "
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
@@
-284,33
+293,18
@@
static void show_version (void)
#else
"-USE_FLOCK "
#endif
#else
"-USE_FLOCK "
#endif
-#ifdef USE_INODESORT
- "+USE_INODESORT "
-#else
- "-USE_INODESORT "
-#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
#endif
);
puts (
"+USE_HCACHE "
#else
"-USE_HCACHE "
#endif
);
puts (
-#ifdef USE_POP
- " +USE_POP "
-#else
- " -USE_POP "
-#endif
#ifdef USE_NNTP
"+USE_NNTP "
#else
"-USE_NNTP "
#endif
#ifdef USE_NNTP
"+USE_NNTP "
#else
"-USE_NNTP "
#endif
-#ifdef USE_IMAP
- "+USE_IMAP "
-#else
- "-USE_IMAP "
-#endif
#ifdef USE_GSS
"+USE_GSS "
#else
#ifdef USE_GSS
"+USE_GSS "
#else
@@
-346,11
+340,6
@@
static void show_version (void)
"+USE_GNU_REGEX "
#else
"-USE_GNU_REGEX "
"+USE_GNU_REGEX "
#else
"-USE_GNU_REGEX "
-#endif
-#ifdef USE_COMPRESSED
- "+COMPRESSED "
-#else
- "-COMPRESSED "
#endif
"\n "
#ifdef HAVE_COLOR
#endif
"\n "
#ifdef HAVE_COLOR
@@
-392,16
+381,6
@@
static void show_version (void)
);
puts (
);
puts (
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
- " +CRYPT_BACKEND_CLASSIC_PGP "
-#else
- " -CRYPT_BACKEND_CLASSIC_PGP "
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
- "+CRYPT_BACKEND_CLASSIC_SMIME "
-#else
- "-CRYPT_BACKEND_CLASSIC_SMIME "
-#endif
#ifdef CRYPT_BACKEND_GPGME
"+CRYPT_BACKEND_GPGME "
#else
#ifdef CRYPT_BACKEND_GPGME
"+CRYPT_BACKEND_GPGME "
#else
@@
-411,11
+390,6
@@
static void show_version (void)
"+BUFFY_SIZE "
#else
"-BUFFY_SIZE "
"+BUFFY_SIZE "
#else
"-BUFFY_SIZE "
-#endif
-#ifdef SUN_ATTACHMENT
- "+SUN_ATTACHMENT "
-#else
- "-SUN_ATTACHMENT "
#endif
"\n "
#ifdef ENABLE_NLS
#endif
"\n "
#ifdef ENABLE_NLS
@@
-423,11
+397,6
@@
static void show_version (void)
#else
"-ENABLE_NLS "
#endif
#else
"-ENABLE_NLS "
#endif
-#ifdef LOCALES_HACK
- "+LOCALES_HACK "
-#else
- "-LOCALES_HACK "
-#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
#else
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
#else
@@
-473,12
+442,6
@@
static void show_version (void)
puts (_("Built-In Defaults:"));
puts (_("Built-In Defaults:"));
-#ifdef DOMAIN
- printf (" +DOMAIN=\"%s\"\n", DOMAIN);
-#else
- puts (" -DOMAIN");
-#endif
-
#ifdef ISPELL
printf (" +ISPELL=\"%s\"\n", ISPELL);
#else
#ifdef ISPELL
printf (" +ISPELL=\"%s\"\n", ISPELL);
#else
@@
-490,7
+453,6
@@
static void show_version (void)
printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
- printf (" +EXECSHELL=\"%s\"\n", EXECSHELL);
#ifdef MIXMASTER
printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER);
#else
#ifdef MIXMASTER
printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER);
#else
@@
-499,8
+461,7
@@
static void show_version (void)
puts (_(ReachingUs));
puts (_(ReachingUs));
- puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
- mutt_print_patchlist ();
+ puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
exit (0);
}
exit (0);
}
@@
-566,8
+527,6
@@
int main (int argc, char **argv)
int i;
int explicit_folder = 0;
int dump_variables = -1;
int i;
int explicit_folder = 0;
int dump_variables = -1;
- extern char *optarg;
- extern int optind;
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
@@
-593,16
+552,16
@@
int main (int argc, char **argv)
SRAND (time (NULL));
umask (077);
SRAND (time (NULL));
umask (077);
-
memset (Options, 0, sizeof
(Options));
-
memset (QuadOptions, 0, sizeof
(QuadOptions));
+
p_clear(Options, sizeof
(Options));
+
p_clear(QuadOptions, sizeof
(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:RTtv
x
yzZ")) != EOF)
+ "A:a:b:F:f:c:d: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:RTtv
x
yzZ")) != EOF)
+ getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
#endif
switch (i) {
case 'A':
#endif
switch (i) {
case 'A':
@@
-618,20
+577,20
@@
int main (int argc, char **argv)
break;
case 'F':
break;
case 'F':
-
str_replace
(&Muttrc, optarg);
+
m_strreplace
(&Muttrc, optarg);
break;
case 'f':
break;
case 'f':
-
strfcpy (folder, optarg, sizeof (folder)
);
+
m_strcpy(folder, sizeof(folder), optarg
);
explicit_folder = 1;
break;
case 'b':
case 'c':
if (!msg)
explicit_folder = 1;
break;
case 'b':
case 'c':
if (!msg)
- msg =
mutt_new_header
();
+ msg =
header_new
();
if (!msg->env)
if (!msg->env)
- msg->env =
mutt_new_envelope
();
+ msg->env =
envelope_new
();
if (i == 'b')
msg->env->bcc = rfc822_parse_adrlist (msg->env->bcc, optarg);
else
if (i == 'b')
msg->env->bcc = rfc822_parse_adrlist (msg->env->bcc, optarg);
else
@@
-640,9
+599,12
@@
int main (int argc, char **argv)
case 'd':
{
case 'd':
{
- char puke[20];
- snprintf (puke, sizeof (puke), "set debug_level=%d", atoi (optarg));
- commands = mutt_add_list (commands, puke);
+ 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;
}
break;
@@
-695,10
+657,6
@@
int main (int argc, char **argv)
version++;
break;
version++;
break;
- case 'x': /* mailx compatible send mode */
- sendflags |= SENDMAILX;
- break;
-
case 'y': /* My special hack mode */
flags |= M_SELECT;
break;
case 'y': /* My special hack mode */
flags |= M_SELECT;
break;
@@
-772,7
+730,7
@@
int main (int argc, char **argv)
if (alias_queries) {
int rv = 0;
if (alias_queries) {
int rv = 0;
-
ADDRESS
*a;
+
address_t
*a;
for (; alias_queries; alias_queries = alias_queries->next) {
if ((a = mutt_lookup_alias (alias_queries->data))) {
for (; alias_queries; alias_queries = alias_queries->next) {
if ((a = mutt_lookup_alias (alias_queries->data))) {
@@
-802,18
+760,16
@@
int main (int argc, char **argv)
if (!option (OPTNOCURSES) && Maildir) {
struct stat sb;
char fpath[_POSIX_PATH_MAX];
if (!option (OPTNOCURSES) && Maildir) {
struct stat sb;
char fpath[_POSIX_PATH_MAX];
- char msg[STRING];
+ char m
e
sg[STRING];
-
strfcpy (fpath, Maildir, sizeof (fpath)
);
+
m_strcpy(fpath, sizeof(fpath), Maildir
);
mutt_expand_path (fpath, sizeof (fpath));
mutt_expand_path (fpath, sizeof (fpath));
-#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
if (mx_get_magic (fpath) != M_IMAP)
/* we're not connected yet - skip mail folder creation */
if (mx_get_magic (fpath) != M_IMAP)
-#endif
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
- snprintf (m
sg, sizeof (m
sg), _("%s does not exist. Create it?"),
+ snprintf (m
esg, sizeof (me
sg), _("%s does not exist. Create it?"),
Maildir);
Maildir);
- if (mutt_yesorno (msg, M_YES) == M_YES) {
+ if (mutt_yesorno (m
e
sg, M_YES) == M_YES) {
if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
}
if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
}
@@
-837,13
+793,13
@@
int main (int argc, char **argv)
mutt_flushinp ();
if (!msg)
mutt_flushinp ();
if (!msg)
- msg =
mutt_new_header
();
+ msg =
header_new
();
if (draftFile)
infile = draftFile;
else {
if (!msg->env)
if (draftFile)
infile = draftFile;
else {
if (!msg->env)
- msg->env =
mutt_new_envelope
();
+ msg->env =
envelope_new
();
for (i = optind; i < argc; i++) {
if (url_check_scheme (argv[i]) == U_MAILTO)
for (i = optind; i < argc; i++) {
if (url_check_scheme (argv[i]) == U_MAILTO)
@@
-860,7
+816,7
@@
int main (int argc, char **argv)
}
if (subject)
}
if (subject)
- msg->env->subject =
str_dup
(subject);
+ msg->env->subject =
m_strdup
(subject);
if (includeFile)
infile = includeFile;
if (includeFile)
infile = includeFile;
@@
-868,12
+824,12
@@
int main (int argc, char **argv)
if (infile || bodytext) {
if (infile) {
if (infile || bodytext) {
if (infile) {
- if (
str_cmp
("-", infile) == 0)
+ if (
m_strcmp
("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
-
strfcpy (path, infile, sizeof (path)
);
+
m_strcpy(path, sizeof(path), infile
);
mutt_expand_path (path, sizeof (path));
if ((fin = fopen (path, "r")) == NULL) {
if (!option (OPTNOCURSES))
mutt_expand_path (path, sizeof (path));
if ((fin = fopen (path, "r")) == NULL) {
if (!option (OPTNOCURSES))
@@
-887,7
+843,7
@@
int main (int argc, char **argv)
fin = NULL;
mutt_mktemp (buf);
fin = NULL;
mutt_mktemp (buf);
- tempfile =
str_dup
(buf);
+ tempfile =
m_strdup
(buf);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
@@
-902,7
+858,7
@@
int main (int argc, char **argv)
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
-
mem_free
(&tempfile);
+
p_delete
(&tempfile);
exit (1);
}
if (fin)
exit (1);
}
if (fin)
@@
-915,7
+871,7
@@
int main (int argc, char **argv)
}
}
}
}
-
mem_free
(&bodytext);
+
p_delete
(&bodytext);
if (attach) {
LIST *t = attach;
if (attach) {
LIST *t = attach;
@@
-980,7
+936,7
@@
int main (int argc, char **argv)
}
if (!folder[0])
}
if (!folder[0])
-
strfcpy (folder, NONULL (Spoolfile), sizeof (folder
));
+
m_strcpy(folder, sizeof(folder), NONULL(Spoolfile
));
#ifdef USE_NNTP
if (option (OPTNEWS)) {
#ifdef USE_NNTP
if (option (OPTNEWS)) {
@@
-992,8
+948,8
@@
int main (int argc, char **argv)
#endif
mutt_expand_path (folder, sizeof (folder));
#endif
mutt_expand_path (folder, sizeof (folder));
-
str_replace
(&CurrentFolder, folder);
-
str_replace
(&LastFolder, folder);
+
m_strreplace
(&CurrentFolder, folder);
+
m_strreplace
(&LastFolder, folder);
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */
@@
-1017,7
+973,7
@@
int main (int argc, char **argv)
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
-
mem_free
(&Context);
+
p_delete
(&Context);
}
mutt_endwin (Errorbuf);
}
}
mutt_endwin (Errorbuf);
}