# 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 "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_crypt.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
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
#else
"-USE_DOTLOCK "
#endif
-#ifdef DL_STANDALONE
- "+DL_STANDALONE "
-#else
- "-DL_STANDALONE "
-#endif
- "\n "
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
#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 (
-#ifdef USE_POP
- " +USE_POP "
-#else
- " -USE_POP "
-#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
"+USE_GNU_REGEX "
#else
"-USE_GNU_REGEX "
-#endif
-#ifdef USE_COMPRESSED
- "+COMPRESSED "
-#else
- "-COMPRESSED "
#endif
"\n "
#ifdef HAVE_COLOR
);
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
"+BUFFY_SIZE "
#else
"-BUFFY_SIZE "
-#endif
-#ifdef SUN_ATTACHMENT
- "+SUN_ATTACHMENT "
-#else
- "-SUN_ATTACHMENT "
#endif
"\n "
#ifdef ENABLE_NLS
#else
"-ENABLE_NLS "
#endif
-#ifdef LOCALES_HACK
- "+LOCALES_HACK "
-#else
- "-LOCALES_HACK "
-#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
#else
puts (_("Built-In Defaults:"));
-#ifdef DOMAIN
- printf (" +DOMAIN=\"%s\"\n", DOMAIN);
-#else
- puts (" -DOMAIN");
-#endif
-
#ifdef ISPELL
printf (" +ISPELL=\"%s\"\n", ISPELL);
#else
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
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 'F':
- str_replace (&Muttrc, optarg);
+ m_strreplace(&Muttrc, optarg);
break;
case 'f':
- strfcpy (folder, optarg, sizeof (folder));
+ m_strcpy(folder, sizeof(folder), optarg);
explicit_folder = 1;
break;
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))) {
char fpath[_POSIX_PATH_MAX];
char msg[STRING];
- strfcpy (fpath, Maildir, sizeof (fpath));
+ m_strcpy(fpath, sizeof(fpath), Maildir);
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)
-#endif
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
Maildir);
}
if (subject)
- msg->env->subject = str_dup (subject);
+ msg->env->subject = m_strdup(subject);
if (includeFile)
infile = includeFile;
if (infile || bodytext) {
if (infile) {
- if (str_cmp ("-", infile) == 0)
+ if (m_strcmp("-", infile) == 0)
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))
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 (!folder[0])
- strfcpy (folder, NONULL (Spoolfile), sizeof (folder));
+ m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
#ifdef USE_NNTP
if (option (OPTNEWS)) {
#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 (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- mem_free (&Context);
+ p_delete(&Context);
}
mutt_endwin (Errorbuf);
}