#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-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-crypt/crypt.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mutt_curses.h"
+#include "alias.h"
+#include "buffy.h"
+#include "sort.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>
-#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
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#endif
#ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.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");
+#ifdef USE_LIBESMTP
+#include <libesmtp.h>
+#endif
+
+#ifdef USE_HCACHE
+#if defined(HAVE_QDBM)
+#include <depot.h>
+#elif defined(HAVE_GDBM)
+#include <gdbm.h>
+#elif defined(HAVE_DB4)
+#include <db.h>
+#endif
+#endif
+
+#ifdef USE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif
+
+#ifdef CRYPT_BACKEND_GPGME
+#include <gpgme.h>
+#endif
+
+#ifdef USE_SSL
+#include <openssl/opensslv.h>
+#endif
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
-Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `muttng -vv' for details.\n");
-
-static const char *Copyright = N_("\
-Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n\
-Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n\
-Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n\
-Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n\
-Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n\
-Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
-Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\n\
-Copyright (C) 2005:\n\
- Parts were written/modified by:\n\
- Andreas Krennmair <ak@synflood.at>\n\
- Nico Golde <nico@ngolde.de>\n\
- Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
-\n\
-Lots of others not mentioned here contributed lots of code,\n\
-fixes, and suggestions.\n\
-\n\
- This program is free software; you can redistribute it and/or modify\n\
- it under the terms of the GNU General Public License as published by\n\
- the Free Software Foundation; either version 2 of the License, or\n\
- (at your option) any later version.\n\
-\n\
- This program is distributed in the hope that it will be useful,\n\
- but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
- GNU General Public License for more details.\n\
-\n\
- You should have received a copy of the GNU General Public License\n\
- along with this program; if not, write to the Free Software\n\
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n\
-");
+Copyright (C) 2005 The Mutt-ng Team\n\
+Copyright (C) 2006 Pierre Habouzit undation, Inc.\n\
+This is free software. You may redistribute copies of it under the terms of\n\
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
+There is NO WARRANTY, to the extent permitted by law.\n");
void mutt_exit (int code)
{
static void mutt_usage (void)
{
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts
- _
- ("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
- muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
- muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
- muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n\
- muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
- muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
- muttng -v[v]\n\
+ _("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
+ madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
+ madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
+ madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
+ puts
+ _("\
+ madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
+ madmutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
+ madmutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
+ madmutt -v\n\
\n\
options:\n\
-A <alias>\texpand the given alias\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\n\
- -D\t\tprint the value of all variables to stdout\n\
+ -c <address>\tspecify a carbon-copy (CC) address");
+ puts _("\
-e <command>\tspecify a command to be executed after initialization\n\
-f <file>\tspecify which mailbox to read\n\
- -F <file>\tspecify an alternate muttrc file\n\
+ -F <file>\tspecify an alternate muttrngc file\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 Mutt-ng should include in the body\n\
- -d <level>\t specify debugging level of Mutt-ng\n\
+ -i <file>\tspecify a file which Madmutt should include in the body");
+ puts _("\
+ -d <level>\t specify debugging level of Madmutt\n\
-m <type>\tspecify a default mailbox type\n\
- -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
+ -n\t\tcauses Madmutt not to read the system Madmuttrc\n\
-p\t\trecall a postponed message\n\
-Q <variable>\tquery a configuration variable\n\
-R\t\topen mailbox in read-only mode\n\
- -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n\
+ -s <subj>\tspecify a subject (must be in quotes if it has spaces)");
+ puts _("\
+ -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\
static void show_version (void)
{
struct utsname uts;
+#ifdef USE_LIBESMTP
+ char buf[STRING];
+#endif
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts (_(Notice));
uname (&uts);
#ifdef _AIX
- printf ("System: %s %s.%s", uts.sysname, uts.version, uts.release);
+ printf ("System:\n %s %s.%s", uts.sysname, uts.version, uts.release);
#elif defined (SCO)
- printf ("System: SCO %s", uts.release);
+ printf ("System:\n SCO %s", uts.release);
#else
- printf ("System: %s %s", uts.sysname, uts.release);
+ printf ("System:\n %s %s", uts.sysname, uts.release);
#endif
- printf (" (%s)", uts.machine);
+ printf (" (%s)\nExternal Libraries:\n", uts.machine);
#ifdef NCURSES_VERSION
- printf (" [using ncurses %s]", NCURSES_VERSION);
+ printf (" ncurses %s\n", NCURSES_VERSION);
#elif defined(USE_SLANG_CURSES)
- printf (" [using slang %d]", SLANG_VERSION);
+ printf (" slang %d\n", SLANG_VERSION);
#endif
#ifdef _LIBICONV_VERSION
- printf (" [using libiconv %d.%d]", _LIBICONV_VERSION >> 8,
+ printf (" libiconv %d.%d\n", _LIBICONV_VERSION >> 8,
_LIBICONV_VERSION & 0xff);
#endif
#ifdef HAVE_LIBIDN
- printf (" [using libidn %s (compiled with %s)]",
+ printf (" libidn %s (compiled with %s)\n",
stringprep_check_version (NULL), STRINGPREP_VERSION);
#endif
- puts (_("\nCompile options:"));
+#ifdef USE_LIBESMTP
+ smtp_version (buf, sizeof (buf), 0);
+ printf (" libESMTP %s\n", buf);
+#endif
-#ifdef DOMAIN
- printf ("DOMAIN=\"%s\"\n", DOMAIN);
-#else
- puts ("-DOMAIN");
+#ifdef USE_HCACHE
+#if defined(HAVE_QDBM)
+ printf (" qdbm %s\n", dpversion);
+#elif defined(HAVE_GDBM)
+ printf (" gdbm %s\n", gdbm_version);
+#elif defined(HAVE_DB4)
+ printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
+ DB_VERSION_PATCH);
+#endif
#endif
-#ifdef DEBUG
- puts ("+DEBUG");
-#else
- puts ("-DEBUG");
+#ifdef USE_GNUTLS
+ 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
+ puts (_("Compile Options:"));
puts (
#ifdef HOMESPOOL
- "+HOMESPOOL "
+ " +HOMESPOOL "
#else
- "-HOMESPOOL "
+ " -HOMESPOOL "
#endif
#ifdef USE_SETGID
"+USE_SETGID "
#else
"-USE_SETGID "
#endif
-#ifdef USE_DOTLOCK
- "+USE_DOTLOCK "
-#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
#else
"-USE_SASL "
#endif
-#ifdef USE_SASL2
- "+USE_SASL2 "
-#else
- "-USE_SASL2 "
-#endif
#ifdef USE_LIBESMTP
"+USE_LIBESMTP "
#else
"-USE_LIBESMTP "
#endif
- "\n"
+ "\n "
#ifdef HAVE_REGCOMP
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
#endif
-#ifdef USE_GNU_REGEX
- "+USE_GNU_REGEX "
-#else
- "-USE_GNU_REGEX "
-#endif
-#ifdef USE_COMPRESSED
- "+COMPRESSED "
-#else
- "-COMPRESSED "
-#endif
- "\n"
+ "\n "
#ifdef HAVE_COLOR
"+HAVE_COLOR "
#else
#else
"-HAVE_BKGDSET "
#endif
- "\n"
+ "\n "
#ifdef HAVE_CURS_SET
"+HAVE_CURS_SET "
#else
);
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
"-CRYPT_BACKEND_GPGME "
#endif
-#ifdef BUFFY_SIZE
- "+BUFFY_SIZE "
-#else
- "-BUFFY_SIZE "
-#endif
-#ifdef SUN_ATTACHMENT
- "+SUN_ATTACHMENT "
-#else
- "-SUN_ATTACHMENT "
-#endif
- "\n"
+ "\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
#else
"-ENABLE_NLS "
#endif
-#ifdef LOCALES_HACK
- "+LOCALES_HACK "
-#else
- "-LOCALES_HACK "
-#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
#else
#else
"-HAVE_LANGINFO_YESEXPR "
#endif
- "\n"
-#if HAVE_ICONV
+ "\n "
+#ifdef HAVE_ICONV
"+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
-#if HAVE_GETSID
+#ifdef HAVE_GETSID
"+HAVE_GETSID "
#else
"-HAVE_GETSID "
#endif
-#if HAVE_GETADDRINFO
+#ifdef HAVE_GETADDRINFO
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
#endif
);
+ puts (_("Built-In Defaults:"));
+
#ifdef ISPELL
- printf ("ISPELL=\"%s\"\n", ISPELL);
+ printf (" +ISPELL=\"%s\"\n", ISPELL);
#else
- puts ("-ISPELL");
+ puts (" -ISPELL");
#endif
- printf ("SENDMAIL=\"%s\"\n", SENDMAIL);
- printf ("MAILPATH=\"%s\"\n", MAILPATH);
- printf ("PKGDATADIR=\"%s\"\n", PKGDATADIR);
- printf ("SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
- printf ("EXECSHELL=\"%s\"\n", EXECSHELL);
+ printf (" +SENDMAIL=\"%s\"\n", SENDMAIL);
+ printf (" +MAILPATH=\"%s\"\n", MAILPATH);
+ printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
+ printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
+ printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
#ifdef MIXMASTER
- printf ("MIXMASTER=\"%s\"\n", MIXMASTER);
+ printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER);
#else
- puts ("-MIXMASTER");
+ puts (" -MIXMASTER\n");
#endif
- puts (_(ReachingUs));
-
- puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
- mutt_print_patchlist ();
+ puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
exit (0);
}
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
- mutt_signal_init ();
+ mutt_signal_initialize ();
#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 ();
-#if HAVE_TYPEAHEAD
+#ifdef HAVE_TYPEAHEAD
typeahead (-1); /* simulate smooth scrolling */
#endif
-#if HAVE_META
+#ifdef HAVE_META
meta (stdscr, TRUE);
#endif
}
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 i;
int explicit_folder = 0;
- int dump_variables = 0;
- extern char *optarg;
- extern int optind;
+ int dump_variables = -1;
/* initialize random number for tmp file creation */
- srand ((unsigned int) time (NULL));
+ srand48((unsigned int) time (NULL));
/* sanity check against stupid administrators */
mutt_error = mutt_nocurses_error;
mutt_message = mutt_nocurses_error;
- SRAND (time (NULL));
+ srand48 (time (NULL));
umask (077);
- memset (Options, 0, sizeof (Options));
- memset (QuadOptions, 0, sizeof (QuadOptions));
+ p_clear(Options, countof(Options));
+ p_clear(QuadOptions, countof(QuadOptions));
+ while ((i = getopt(argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ"
#ifdef USE_NNTP
- while ((i =
- getopt (argc, argv,
- "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF)
-#else
- while ((i =
- getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
+ "g:G"
#endif
+ )) >= 0)
switch (i) {
case 'A':
alias_queries = mutt_add_list (alias_queries, optarg);
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;
case 'b':
case 'c':
if (!msg)
- msg = mutt_new_header ();
+ msg = header_new();
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
msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg);
break;
- case 'd':
- debug_setlevel(atoi(optarg));
-#ifdef DEBUG
- if (atoi(optarg) <= DEBUG_MAX_LEVEL && atoi(optarg) >= DEBUG_MIN_LEVEL)
- printf (_("Debugging at level %d.\n"), atoi(optarg));
- else {
- printf(_("Please specify a valid debugging level ("
- DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n"));
- return 1;
- }
-#else
- printf _("DEBUG was not defined during compilation. Ignored.\n");
-#endif
+ case 't':
+ dump_variables = 2;
break;
- case 'D':
+ case 'T':
dump_variables = 1;
break;
version++;
break;
- case 'x': /* mailx compatible send mode */
- sendflags |= SENDMAILX;
- break;
-
case 'y': /* My special hack mode */
flags |= M_SELECT;
break;
{
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);
}
mutt_usage ();
}
- switch (version) {
- case 0:
- break;
- case 1:
+ if (version) {
show_version ();
- break;
- default:
- puts (mutt_make_version ());
- puts (_(Copyright));
- puts (_(ReachingUs));
- exit (0);
}
/* Check for a batch send. */
- if (!isatty (0) || queries || alias_queries || dump_variables) {
+ if (!isatty (0) || queries || alias_queries || dump_variables > 0) {
set_option (OPTNOCURSES);
sendflags = SENDBATCH;
}
start_curses ();
/* 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 ();
if (queries)
return mutt_query_variables (queries);
- if (dump_variables)
- return (mutt_dump_variables ());
+ if (dump_variables > 0)
+ return (mutt_dump_variables (dump_variables-1));
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))) {
+ 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);
- }
- else {
+ address_list_wipe(&a);
+ } else {
rv = 1;
printf ("%s\n", alias_queries->data);
}
if (!option (OPTNOCURSES) && Maildir) {
struct stat sb;
char fpath[_POSIX_PATH_MAX];
- char msg[STRING];
+ char mesg[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?"),
+ snprintf (mesg, sizeof (mesg), _("%s does not exist. Create it?"),
Maildir);
- if (mutt_yesorno (msg, M_YES) == M_YES) {
+ if (mutt_yesorno (mesg, M_YES) == M_YES) {
if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
}
mutt_flushinp ();
if (!msg)
- msg = mutt_new_header ();
+ msg = header_new();
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)
}
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);
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
perror (tempfile);
- fclose (fin);
- mem_free (&tempfile);
+ m_fclose(&fin);
+ p_delete(&tempfile);
exit (1);
}
if (fin)
mutt_copy_stream (fin, fout);
else if (bodytext)
fputs (bodytext, fout);
- fclose (fout);
+ m_fclose(&fout);
if (fin && fin != stdin)
- fclose (fin);
+ m_fclose(&fin);
}
}
- mem_free (&bodytext);
+ p_delete(&bodytext);
if (attach) {
- LIST *t = attach;
+ string_list_t *t = attach;
BODY *a = NULL;
while (t) {
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;
}
- mutt_free_list (&attach);
+ string_list_wipe(&attach);
}
ci_send_message (sendflags, msg, tempfile, NULL, NULL);
mutt_endwin (Errorbuf);
exit (1);
}
- }
- else
+ } else
#endif
- if (!Incoming) {
+ if (!Incoming.len) {
mutt_endwin _("No incoming mailboxes defined.");
exit (1);
}
if (!folder[0])
- strfcpy (folder, NONULL (Spoolfile), sizeof (folder));
+ m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
#ifdef USE_NNTP
if (option (OPTNEWS)) {
unset_option (OPTNEWS);
nntp_expand_path (folder, sizeof (folder),
&CurrentNewsSrv->conn->account);
- }
- else
+ } else
#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 */
|| !explicit_folder) {
mutt_index_menu ();
if (option (OPTXTERMSETTITLES))
- mutt_xterm_set_title (NONULL (XtermLeave));
+ printf("\033]2;%s\007", NONULL(XtermLeave));
if (Context)
- mem_free (&Context);
+ p_delete(&Context);
}
mutt_endwin (Errorbuf);
}
projects / apps / madmutt.git / blobdiff