projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build imap as well.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d0c4b0c
..
3596712
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,17
+20,21
@@
#endif
#include <lib-lib/mem.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 "mutt_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/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-280,12
+284,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
@@
-296,11
+294,6
@@
static void show_version (void)
#else
"-USE_FLOCK "
#endif
#else
"-USE_FLOCK "
#endif
-#ifdef USE_INODESORT
- "+USE_INODESORT "
-#else
- "-USE_INODESORT "
-#endif
#ifdef USE_HCACHE
"+USE_HCACHE "
#else
#ifdef USE_HCACHE
"+USE_HCACHE "
#else
@@
-308,21
+301,11
@@
static void show_version (void)
#endif
);
puts (
#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
@@
-358,11
+341,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
@@
-404,16
+382,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
@@
-423,11
+391,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
@@
-435,11
+398,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
@@
-485,12
+443,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
@@
-502,7
+454,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
@@
-602,8
+553,8
@@
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 =
#ifdef USE_NNTP
while ((i =
@@
-627,11
+578,11
@@
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;
explicit_folder = 1;
break;
@@
-784,7
+735,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))) {
@@
-816,12
+767,10
@@
int main (int argc, char **argv)
char fpath[_POSIX_PATH_MAX];
char msg[STRING];
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));
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) {
snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
Maildir);
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
Maildir);
@@
-872,7
+821,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;
@@
-880,12
+829,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))
@@
-899,7
+848,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);
@@
-992,7
+941,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)) {
@@
-1004,8
+953,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 */