X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=3f14b787e3a3e2a974d30fee3137ce3dc4373937;hp=8c294d2b4d7a046aa5fd00c14117bcef05c5e005;hb=88d22daa9c1316d5ccc4b4bb60d40cc96c767757;hpb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e

diff --git a/imap/util.c b/imap/util.c
index 8c294d2..3f14b78 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -11,58 +11,17 @@
 
 /* general IMAP utility functions */
 
-#include "config.h"
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-
-#include "mutt.h"
-#include "mx.h"                 /* for M_IMAP */
-#include "url.h"
-#include "imap_private.h"
-#include <lib-network/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 <lib-lib/lib-lib.h>
 #include <signal.h>
 #include <netdb.h>
-#include <netinet/in.h>
+#include <lib-mx/mx.h>
 
-#include <errno.h>
+#include "mutt.h"
+#include "imap_private.h"
+#include <lib-sys/mutt_ssl.h>
 
 /* -- public functions -- */
 
-/* imap_expand_path: IMAP implementation of mutt_expand_path. Rewrite
- *   an IMAP path in canonical and absolute form.
- * Inputs: a buffer containing an IMAP path, and the number of bytes in
- *   that buffer.
- * Outputs: The buffer is rewritten in place with the canonical IMAP path.
- * Returns 0 on success, or -1 if imap_parse_path chokes or url_ciss_tostring
- *   fails, which it might if there isn't enough room in the buffer. */
-int imap_expand_path (char *path, size_t len)
-{
-  IMAP_MBOX mx;
-  ciss_url_t url;
-  int rc;
-
-  if (imap_parse_path (path, &mx) < 0)
-    return -1;
-
-  mutt_account_tourl (&mx.account, &url);
-  url.path = mx.mbox;
-
-  rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD);
-  p_delete(&mx.mbox);
-
-  return rc;
-}
-
 /* imap_parse_path: given an IMAP mailbox name, return host, port
  *   and a path IMAP servers will recognise.
  * mx.mbox is malloc'd, caller must free it */
@@ -80,7 +39,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 +46,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 */
@@ -200,7 +157,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,7 +171,7 @@ 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;
 
@@ -451,12 +408,12 @@ void imap_unmunge_mbox_name (char *s)
 /* imap_wordcasecmp: find word a in word list b */
 int imap_wordcasecmp (const char *a, const char *b)
 {
-  char tmp[SHORT_STRING];
+  char tmp[STRING];
   char *s = (char *) b;
   int i;
 
-  tmp[SHORT_STRING - 1] = 0;
-  for (i = 0; i < SHORT_STRING - 2; i++, s++) {
+  tmp[STRING - 1] = 0;
+  for (i = 0; i < STRING - 2; i++, s++) {
     if (!*s || ISSPACE (*s)) {
       tmp[i] = 0;
       break;
@@ -474,7 +431,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 */
 }