projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutt_enter_string is only used for _mutt_get_field for real.
[apps/madmutt.git]
/
lib-mx
/
mx.c
diff --git
a/lib-mx/mx.c
b/lib-mx/mx.c
index
5d735c6
..
6e84b10
100644
(file)
--- a/
lib-mx/mx.c
+++ b/
lib-mx/mx.c
@@
-15,7
+15,7
@@
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/
sidebar
.h>
+#include <lib-ui/
lib-ui
.h>
#include "mutt.h"
#include "crypt.h"
#include "mutt.h"
#include "crypt.h"
@@
-32,9
+32,6
@@
#include <imap/imap.h>
#include "pop.h"
#include <imap/imap.h>
#include "pop.h"
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
static mx_t const *mxfmts[] = {
&mbox_mx,
static mx_t const *mxfmts[] = {
&mbox_mx,
@@
-42,9
+39,6
@@
static mx_t const *mxfmts[] = {
&maildir_mx,
&imap_mx,
&pop_mx,
&maildir_mx,
&imap_mx,
&pop_mx,
-#ifdef USE_NNTP
- &nntp_mx,
-#endif
&compress_mx,
};
&compress_mx,
};
@@
-53,7
+47,7
@@
static mx_t const *mxfmts[] = {
static int dotlock_file(const char *path, int retry)
{
static int dotlock_file(const char *path, int retry)
{
- char lockfile[PATH_MAX];
+ char lockfile[
_POSIX_
PATH_MAX];
snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
if (lockfile_create(lockfile, retry ? 1 : 0, 0)) {
snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
if (lockfile_create(lockfile, retry ? 1 : 0, 0)) {
@@
-65,7
+59,7
@@
static int dotlock_file(const char *path, int retry)
static int undotlock_file (const char *path)
{
static int undotlock_file (const char *path)
{
- char lockfile[PATH_MAX];
+ char lockfile[
_POSIX_
PATH_MAX];
snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
return lockfile_remove(lockfile);
}
snprintf(lockfile, sizeof(lockfile), "%s.lock", path);
return lockfile_remove(lockfile);
}
@@
-582,15
+576,6
@@
static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
ctx->closing = 1;
ctx->closing = 1;
-#ifdef USE_NNTP
- if (ctx->magic == M_NNTP) {
- int ret;
-
- ret = nntp_close_mailbox (ctx);
- mx_fastclose_mailbox (ctx);
- return ret;
- }
-#endif
if (ctx->readonly || ctx->dontwrite) {
/* mailbox is readonly or we don't want to write */
mx_fastclose_mailbox (ctx);
if (ctx->readonly || ctx->dontwrite) {
/* mailbox is readonly or we don't want to write */
mx_fastclose_mailbox (ctx);
@@
-1064,15
+1049,6
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
break;
}
break;
}
-#ifdef USE_NNTP
- case M_NNTP:
- {
- if (nntp_fetch_message (msg, ctx, msgno) != 0)
- p_delete(&msg);
- break;
- }
-#endif /* USE_NNTP */
-
default:
p_delete(&msg);
break;
default:
p_delete(&msg);
break;
@@
-1097,12
+1073,8
@@
int mx_close_message (MESSAGE ** msg)
int r = 0;
if ((*msg)->magic == M_MH || (*msg)->magic == M_MAILDIR
int r = 0;
if ((*msg)->magic == M_MH || (*msg)->magic == M_MAILDIR
- || (*msg)->magic == M_IMAP
- || (*msg)->magic == M_POP
-#ifdef USE_NNTP
- || (*msg)->magic == M_NNTP
-#endif
- ) {
+ || (*msg)->magic == M_IMAP || (*msg)->magic == M_POP)
+ {
r = m_fclose(&(*msg)->fp);
}
else
r = m_fclose(&(*msg)->fp);
}
else