X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=23997aa284f61f7a83bfc9a3751ce8e95e3f305d;hp=5d735c6d944d3ed007a29adf79b548139d9791ce;hb=ec42b5f9dbca7a552524c138f6764671612fe385;hpb=0adb0e69973572d243ddbc54efece754aa6729c9

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 5d735c6..23997aa 100644
--- 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-ui/sidebar.h>
+#include <lib-ui/lib-ui.h>
 
 #include "mutt.h"
 #include "crypt.h"
@@ -32,9 +32,6 @@
 
 #include <imap/imap.h>
 #include "pop.h"
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
 
 static mx_t const *mxfmts[] = {
     &mbox_mx,
@@ -42,9 +39,6 @@ static mx_t const *mxfmts[] = {
     &maildir_mx,
     &imap_mx,
     &pop_mx,
-#ifdef USE_NNTP
-    &nntp_mx,
-#endif
     &compress_mx,
 };
 
@@ -53,7 +47,7 @@ static mx_t const *mxfmts[] = {
 
 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)) {
@@ -65,7 +59,7 @@ static int dotlock_file(const char *path, int retry)
 
 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);
 }
@@ -145,7 +139,7 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
         prev_sb = sb;
 
         mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
-        sleep (1);
+        mutt_sleep (1);
     }
 #endif /* USE_FCNTL */
 
@@ -180,7 +174,7 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
         prev_sb = sb;
 
         mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
-        sleep (1);
+        mutt_sleep (1);
     }
 #endif /* USE_FLOCK */
 
@@ -582,15 +576,6 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
 
   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);
@@ -1064,15 +1049,6 @@ MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
       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;
@@ -1097,12 +1073,8 @@ int mx_close_message (MESSAGE ** msg)
   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