projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop the old string API fully.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
1458f72
..
13749ce
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 "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/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\
@@
-225,7
+237,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
+252,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
+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
@@
-289,7
+299,7
@@
static void show_version (void)
#else
"-USE_INODESORT "
#endif
#else
"-USE_INODESORT "
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
"+USE_HCACHE "
#else
"-USE_HCACHE "
@@
-499,8
+509,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
+575,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,8
+600,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 =
@@
-618,11
+625,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;
@@
-639,10
+646,14
@@
int main (int argc, char **argv)
break;
case 'd':
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':
break;
case 't':
@@
-707,7
+718,7
@@
int main (int argc, char **argv)
{
char buf[LONG_STRING];
{
char buf[LONG_STRING];
- snprintf (buf, sizeof (buf), "set n
ews_server
=%s", optarg);
+ snprintf (buf, sizeof (buf), "set n
ntp_host
=%s", optarg);
commands = mutt_add_list (commands, buf);
}
commands = mutt_add_list (commands, buf);
}
@@
-771,7
+782,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))) {
@@
-803,7
+814,7
@@
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));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
mutt_expand_path (fpath, sizeof (fpath));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
@@
-859,7
+870,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;
@@
-867,12
+878,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))
@@
-886,7
+897,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);
@@
-901,7
+912,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)
@@
-914,7
+925,7
@@
int main (int argc, char **argv)
}
}
}
}
-
mem_free
(&bodytext);
+
p_delete
(&bodytext);
if (attach) {
LIST *t = attach;
if (attach) {
LIST *t = attach;
@@
-979,7
+990,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)) {
@@
-991,8
+1002,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 */
@@
-1016,7
+1027,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);
}