rationnalize includes a lot:

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

diff --git a/imap/util.c b/imap/util.c
index 1025cea..d7837e1 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -11,31 +11,14 @@
 
 /* general IMAP utility functions */
 
 
 /* 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 "mutt.h"
 #include "mx.h"                 /* for M_IMAP */

-#include "ascii.h"
-#include "url.h"

 #include "imap_private.h"
 #include "imap_private.h"

-#include "mutt_ssl.h"
-
-#include "lib/mem.h"
-#include "lib/intl.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 -- */
 
 
 /* -- public functions -- */
 


@@ -81,7 +64,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapPort = ntohs (service->s_port);
     else
       ImapPort = IMAP_PORT;
       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");
   }
   if (!ImapsPort) {
     service = getservbyname ("imaps", "tcp");


@@ -89,7 +71,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapsPort = ntohs (service->s_port);
     else
       ImapsPort = IMAP_SSL_PORT;
       ImapsPort = ntohs (service->s_port);
     else
       ImapsPort = IMAP_SSL_PORT;

-    debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));

   }
 
   /* Defaults */
   }
 
   /* Defaults */


@@ -97,7 +78,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   mx->account.port = ImapPort;
   mx->account.type = M_ACCT_TYPE_IMAP;
 
   mx->account.port = ImapPort;
   mx->account.type = M_ACCT_TYPE_IMAP;
 

-  c = str_dup (path);
+  c = m_strdup(path);

   url_parse_ciss (&url, c);
 
   if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
   url_parse_ciss (&url, c);
 
   if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||


@@ -106,7 +87,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
     return -1;
   }
 
     return -1;
   }
 

-  mx->mbox = str_dup (url.path);
+  mx->mbox = m_strdup(url.path);

 
   if (url.scheme == U_IMAPS)
     mx->account.flags |= M_ACCT_SSL;
 
   if (url.scheme == U_IMAPS)
     mx->account.flags |= M_ACCT_SSL;


@@ -133,12 +114,12 @@ void imap_pretty_mailbox (char *path)
   if (imap_parse_path (path, &target) < 0)
     return;
 
   if (imap_parse_path (path, &target) < 0)
     return;
 

-  tlen = str_len (target.mbox);
+  tlen = m_strlen(target.mbox);

   /* check whether we can do '=' substitution */
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
   /* check whether we can do '=' substitution */
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {

-    hlen = str_len (home.mbox);
+    hlen = m_strlen(home.mbox);

     if (tlen && mutt_account_match (&home.account, &target.account) &&
     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
       if (!hlen)
         home_match = 1;
       else


@@ -191,7 +172,7 @@ void imap_error (const char *where, const char *msg)
  *   Returns NULL on failure (no mem) */
 IMAP_DATA *imap_new_idata (void)
 {
  *   Returns NULL on failure (no mem) */
 IMAP_DATA *imap_new_idata (void)
 {

-  return mem_calloc (1, sizeof (IMAP_DATA));
+  return p_new(IMAP_DATA, 1);

 }
 
 /* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
 }
 
 /* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */


@@ -201,7 +182,7 @@ void imap_free_idata (IMAP_DATA ** idata)
     return;
 
   p_delete(&(*idata)->capstr);
     return;
 
   p_delete(&(*idata)->capstr);

-  mutt_free_list (&(*idata)->flags);
+  string_list_wipe(&(*idata)->flags);

   p_delete(&((*idata)->cmd.buf));
   p_delete(idata);
 }
   p_delete(&((*idata)->cmd.buf));
   p_delete(idata);
 }


@@ -215,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,
  * 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) {
 {
   int x = 0;
 
   if (!mailbox || !*mailbox) {

-    strfcpy (path, "INBOX", plen);
+    m_strcpy(path, plen, "INBOX");

     return path;
   }
 
     return path;
   }
 


@@ -293,8 +274,7 @@ char *imap_next_word (char *s)
     s++;
   }
 
     s++;
   }
 

-  SKIPWS (s);
-  return s;
+  return vskipspaces(s);

 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */


@@ -427,7 +407,7 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
 {
   char *buf;
 
 {
   char *buf;
 

-  buf = str_dup (src);
+  buf = m_strdup(src);

   imap_utf7_encode (&buf);
 
   imap_quote_string (dest, dlen, buf);
   imap_utf7_encode (&buf);
 
   imap_quote_string (dest, dlen, buf);


@@ -441,10 +421,10 @@ void imap_unmunge_mbox_name (char *s)
 
   imap_unquote_string (s);
 
 
   imap_unquote_string (s);
 

-  buf = str_dup (s);
+  buf = m_strdup(s);

   if (buf) {
     imap_utf7_decode (&buf);
   if (buf) {
     imap_utf7_decode (&buf);

-    strncpy (s, buf, str_len (s));
+    m_strcpy(s, m_strlen(s) + 1, buf);

   }
 
   p_delete(&buf);
   }
 
   p_delete(&buf);


@@ -476,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 */
 }
 {
   /* empty */
 }


@@ -497,7 +477,7 @@ void imap_keepalive (void)
         if (idata->ctx)
           ctx = idata->ctx;
         else {
         if (idata->ctx)
           ctx = idata->ctx;
         else {

-          ctx = mem_calloc (1, sizeof (CONTEXT));
+          ctx = p_new(CONTEXT, 1);

           ctx->data = idata;
         }
         imap_check_mailbox (ctx, NULL, 1);
           ctx->data = idata;
         }
         imap_check_mailbox (ctx, NULL, 1);