# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.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>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#include <libesmtp.h>
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
#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\
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
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
#else
"-USE_INODESORT "
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
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);
}
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));
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 =
break;
case 'd':
- debug_setlevel(atoi(optarg));
-#ifndef DEBUG
- printf _("DEBUG was not defined during compilation. Ignored.\n");
-#endif
+ {
+ 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':
{
char buf[LONG_STRING];
- snprintf (buf, sizeof (buf), "set news_server=%s", optarg);
+ snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg);
commands = mutt_add_list (commands, buf);
}
}
if (subject)
- msg->env->subject = str_dup (subject);
+ msg->env->subject = m_strdup(subject);
if (includeFile)
infile = includeFile;
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);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
- mem_free (&tempfile);
+ p_delete(&tempfile);
exit (1);
}
if (fin)
}
}
- mem_free (&bodytext);
+ p_delete(&bodytext);
if (attach) {
LIST *t = attach;
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- mem_free (&Context);
+ p_delete(&Context);
}
mutt_endwin (Errorbuf);
}