path_canon: drop folder

diff --git a/compress.c b/compress.c
index 997b0d6ee7afa227a2a240baf25a25a482a6fc67..0300b098f54978af466719f03d5d3736e920b9b9 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -941,20 +941,11 @@ enum MailboxType comp_path_probe(const char *path, const struct stat *st)
 /**
  * comp_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int comp_path_canon(char *buf, size_t buflen, const char *folder)
+int comp_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    buf[0] = '/';
-    mutt_str_inline_replace(buf, buflen, 0, folder);
-  }
-
   mutt_path_canon(buf, buflen, HomeDir);
   return 0;
 }

diff --git a/imap/imap.c b/imap/imap.c
index dfb0db7bc33a80ef25bde9bcbf861e2fc7e191c7..ca8ad20d53c8a2e07d8f938862cb0bccef42c27b 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -2821,30 +2821,11 @@ enum MailboxType imap_path_probe(const char *path, const struct stat *st)
 /**
  * imap_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int imap_path_canon(char *buf, size_t buflen, const char *folder)
+int imap_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-#if 0
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    size_t flen = mutt_str_strlen(folder);
-    if ((flen > 0) && (folder[flen - 1] != '/'))
-    {
-      buf[0] = '/';
-      mutt_str_inline_replace(buf, buflen, 0, folder);
-    }
-    else
-    {
-      mutt_str_inline_replace(buf, buflen, 1, folder);
-    }
-  }
-#endif
-
   struct Url url;
   char tmp[PATH_MAX];
   char tmp2[PATH_MAX];

diff --git a/imap/imap.h b/imap/imap.h
index 40ad299680bf48e763705f460501009c68b3813c..85f74098199a2613e9e2e47b2e5d5ba232653ad3 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -96,7 +96,7 @@ int imap_subscribe(char *path, bool subscribe);
 int imap_complete(char *buf, size_t buflen, char *path);
 int imap_fast_trash(struct Mailbox *m, char *dest);
 int imap_path_probe(const char *path, const struct stat *st);
-int imap_path_canon(char *buf, size_t buflen, const char *folder);
+int imap_path_canon(char *buf, size_t buflen);
 
 extern struct MxOps mx_imap_ops;
 

diff --git a/maildir/mh.c b/maildir/mh.c
index 02dcb0435f9d6a0894069c42f1c719048c4764ef..a1f5ecd0c8213b98c48aaaea35296268b566436a 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -2747,20 +2747,11 @@ enum MailboxType maildir_path_probe(const char *path, const struct stat *st)
 /**
  * maildir_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int maildir_path_canon(char *buf, size_t buflen, const char *folder)
+int maildir_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    buf[0] = '/';
-    mutt_str_inline_replace(buf, buflen, 0, folder);
-  }
-
   mutt_path_canon(buf, buflen, HomeDir);
   return 0;
 }

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 3963a866aa6831298f09e1e63bff3a59d01da313..492a52944d6c0ed18b2cd8b8efdf02e59071a2f6 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -1714,20 +1714,11 @@ enum MailboxType mbox_path_probe(const char *path, const struct stat *st)
 /**
  * mbox_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int mbox_path_canon(char *buf, size_t buflen, const char *folder)
+int mbox_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    buf[0] = '/';
-    mutt_str_inline_replace(buf, buflen, 0, folder);
-  }
-
   mutt_path_canon(buf, buflen, HomeDir);
   return 0;
 }

diff --git a/muttlib.c b/muttlib.c
index cfe490cfd852f1cb3739362f4f84455d27631d6f..aa06d981fee59f3a014bf8c40a56f8077775b907 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -294,7 +294,7 @@ char *mutt_expand_path_regex(char *buf, size_t buflen, bool regex)
   /* Rewrite IMAP path in canonical form - aids in string comparisons of
    * folders. May possibly fail, in which case buf should be the same. */
   if (imap_path_probe(buf, NULL) == MUTT_IMAP)
-    imap_path_canon(buf, buflen, NULL);
+    imap_path_canon(buf, buflen);
 #endif
 
   return buf;

diff --git a/mx.c b/mx.c
index 518a2d34bf7f339c7fed23078166bdf846e256c5..00f14e711d4e4f8b32eccb1c712c8fcf4c4c7cb6 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1558,7 +1558,7 @@ int mx_path_canon(char *buf, size_t buflen, const char *folder, enum MailboxType
   if (!ops || !ops->path_canon)
     return -1;
 
-  if (ops->path_canon(buf, buflen, folder) < 0)
+  if (ops->path_canon(buf, buflen) < 0)
   {
     mutt_path_canon(buf, buflen, HomeDir);
   }
@@ -1602,7 +1602,7 @@ int mx_path_pretty(char *buf, size_t buflen, const char *folder)
   if (!ops->path_canon)
     return -1;
 
-  if (ops->path_canon(buf, buflen, folder) < 0)
+  if (ops->path_canon(buf, buflen) < 0)
     return -1;
 
   if (!ops->path_pretty)

diff --git a/mx.h b/mx.h
index 8c1bfe98bc28e0902ec13ddc47f0ff32ff84ecac..e122c07e7d54388ad2b79a69bfa8748faf7e9e44 100644 (file)
--- a/mx.h
+++ b/mx.h
@@ -227,11 +227,10 @@ struct MxOps
    * path_canon - Canonicalise a mailbox path
    * @param buf    Path to modify
    * @param buflen Length of buffer
-   * @param folder Base path for '=' substitution
    * @retval  0 Success
    * @retval -1 Failure
    */
-  int (*path_canon)      (char *buf, size_t buflen, const char *folder);
+  int (*path_canon)      (char *buf, size_t buflen);
   /**
    * path_pretty - Abbreviate a mailbox path
    * @param buf    Path to modify

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 90debff4c7352c1edc8b1db5d12f347961c7d9ca..439b8cddf7ac12a8dc87ba304c4525a7892c13c4 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -2877,28 +2877,11 @@ enum MailboxType nntp_path_probe(const char *path, const struct stat *st)
 /**
  * nntp_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int nntp_path_canon(char *buf, size_t buflen, const char *folder)
+int nntp_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    size_t flen = mutt_str_strlen(folder);
-    if ((flen > 0) && (folder[flen - 1] != '/'))
-    {
-      buf[0] = '/';
-      mutt_str_inline_replace(buf, buflen, 0, folder);
-    }
-    else
-    {
-      mutt_str_inline_replace(buf, buflen, 1, folder);
-    }
-  }
-
   return 0;
 }
 

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 8ba77351e2b722ebb93d483121b0e80df5eb0c18..4bee6bd8704f29c7e32ad86cdcdd448c1a0a1e49 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -2544,28 +2544,11 @@ enum MailboxType nm_path_probe(const char *path, const struct stat *st)
 /**
  * nm_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int nm_path_canon(char *buf, size_t buflen, const char *folder)
+int nm_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    size_t flen = mutt_str_strlen(folder);
-    if ((flen > 0) && (folder[flen - 1] != '/'))
-    {
-      buf[0] = '/';
-      mutt_str_inline_replace(buf, buflen, 0, folder);
-    }
-    else
-    {
-      mutt_str_inline_replace(buf, buflen, 1, folder);
-    }
-  }
-
   return 0;
 }
 

diff --git a/pop/pop.c b/pop/pop.c
index e0c029dcdcac9913be1568d5ed426470d35f519e..9889f00e59749712b4ea43573710039d6eda1da5 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -1257,28 +1257,11 @@ enum MailboxType pop_path_probe(const char *path, const struct stat *st)
 /**
  * pop_path_canon - Canonicalise a mailbox path - Implements MxOps::path_canon()
  */
-int pop_path_canon(char *buf, size_t buflen, const char *folder)
+int pop_path_canon(char *buf, size_t buflen)
 {
   if (!buf)
     return -1;
 
-  if ((buf[0] == '+') || (buf[0] == '='))
-  {
-    if (!folder)
-      return -1;
-
-    size_t flen = mutt_str_strlen(folder);
-    if ((flen > 0) && (folder[flen - 1] != '/'))
-    {
-      buf[0] = '/';
-      mutt_str_inline_replace(buf, buflen, 0, folder);
-    }
-    else
-    {
-      mutt_str_inline_replace(buf, buflen, 1, folder);
-    }
-  }
-
   return 0;
 }