rationnalize includes a lot:

[apps/madmutt.git] / imap / util.c

diff --git a/imap/util.c b/imap/util.c
index 992423e..d7837e1 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -11,30 +11,14 @@
 
 /* general IMAP utility functions */
 
-#include "config.h"
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
+#include <signal.h>
+#include <netdb.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
-#include "ascii.h"
-#include "url.h"
 #include "imap_private.h"
-#include "mutt_ssl.h"
-
-#include <lib-lib/macros.h>
-#include "lib/debug.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-#include <errno.h>
+#include <lib-sys/mutt_ssl.h>
 
 /* -- public functions -- */
 
@@ -80,7 +64,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapPort = ntohs (service->s_port);
     else
       ImapPort = IMAP_PORT;
-    debug_print (3, ("Using default IMAP port %d\n", ImapPort));
   }
   if (!ImapsPort) {
     service = getservbyname ("imaps", "tcp");
@@ -88,7 +71,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapsPort = ntohs (service->s_port);
     else
       ImapsPort = IMAP_SSL_PORT;
-    debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
   }
 
   /* Defaults */
@@ -137,7 +119,7 @@ void imap_pretty_mailbox (char *path)
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
     hlen = m_strlen(home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
-        !str_ncmp (home.mbox, target.mbox, hlen)) {
+        !m_strncmp(home.mbox, target.mbox, hlen)) {
       if (!hlen)
         home_match = 1;
       else
@@ -200,7 +182,7 @@ void imap_free_idata (IMAP_DATA ** idata)
     return;
 
   p_delete(&(*idata)->capstr);
-  mutt_free_list (&(*idata)->flags);
+  string_list_wipe(&(*idata)->flags);
   p_delete(&((*idata)->cmd.buf));
   p_delete(idata);
 }
@@ -214,12 +196,12 @@ void imap_free_idata (IMAP_DATA ** idata)
  * Moreover, IMAP servers may dislike the path ending with the delimiter.
  */
 char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
-                     size_t plen)
+                     ssize_t plen)
 {
   int x = 0;
 
   if (!mailbox || !*mailbox) {
-    strfcpy (path, "INBOX", plen);
+    m_strcpy(path, plen, "INBOX");
     return path;
   }
 
@@ -292,8 +274,7 @@ char *imap_next_word (char *s)
     s++;
   }
 
-  SKIPWS (s);
-  return s;
+  return vskipspaces(s);
 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
@@ -443,7 +424,7 @@ void imap_unmunge_mbox_name (char *s)
   buf = m_strdup(s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, m_strlen(s));
+    m_strcpy(s, m_strlen(s) + 1, buf);
   }
 
   p_delete(&buf);
@@ -475,7 +456,7 @@ int imap_wordcasecmp (const char *a, const char *b)
  * 
  */
 
-static RETSIGTYPE alrm_handler (int sig)
+static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
 {
   /* empty */
 }