Improve folder handling and expansion in mail. Add convenience functions to the library.

* configure.ac: Build libmailutils/wicket
* libmailutils/Makefile.am: Likewise.
* libmailutils/base/wicket.c: Move file wicket stuff to ...
* libmailutils/wicket/file.c: ... here
* libmailutils/wicket/noauth.c: New file.
* libmailutils/wicket/Makefile.am: New file.

* include/mailutils/auth.h (mu_noauth_ticket_create)
(mu_noauth_wicket_create): New protos.
* include/mailutils/folder.h (mu_folder_attach_ticket)
(mu_folder_is_local): New protos.
* include/mailutils/mailbox.h (mu_mailbox_attach_ticket): New proto.
* include/mailutils/sys/folder.h (_mu_folder): Remove flags. Add
new member: is_local.
* libmailutils/mailbox/folder.c (mu_folder_create_from_record): Set is_local.
(mu_folder_attach_ticket): New function.
(mu_folder_is_local): New function.
* libmailutils/mailbox/mbx_default.c (mu_mailbox_attach_ticket): New function.
* libmailutils/url/create.c: Allow for trailing / in url.

* libproto/imap/mbox.c (_imap_mbx_open): Do initial scan.
(__imap_msg_get_stream): Initialize clos.size.
* libproto/imap/tests/imapfolder.c: Attach ticket to the folder.

* mail/cd.c (mail_cd): Expand directory name (~, %, + notations) prior
to use.
* mail/file.c (mail_file): Attach ticket to the mailbox.
* mail/copy.c (append_to_mailbox): Likewise.
* mail/mailline.c: Rewrite directory expansion. Implement fully
functional folder expansion.
* mail/util.c (util_folder_path)
(util_outfolder_name): Rewrite using mu_mailbox_expand_name.

1 files changed, 7 insertions, 36 deletions

diff --git a/libmailutils/mailbox/mbx_default.c b/libmailutils/mailbox/mbx_default.c
index 29890bfa8..bd9f8763d 100644
--- a/libmailutils/mailbox/mbx_default.c
+++ b/libmailutils/mailbox/mbx_default.c
@@ -344,44 +344,15 @@ percent_expand (const char *file, char **mbox)
   return status;
 }
 
-static void
-attach_auth_ticket (mu_mailbox_t mbox)
+int
+mu_mailbox_attach_ticket (mu_mailbox_t mbox)
 {
+  int rc;
   mu_folder_t folder = NULL;
-  mu_authority_t auth = NULL;
 
-  if (mu_mailbox_get_folder (mbox, &folder) == 0
-      && mu_folder_get_authority (folder, &auth) == 0
-      && auth)
-    {
-      char *filename = mu_tilde_expansion (mu_ticket_file,
-					   MU_HIERARCHY_DELIMITER, NULL);
-      mu_wicket_t wicket;
-      int rc;
-  
-      mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_TRACE1,
-		("Reading user ticket file %s", filename));
-      if ((rc = mu_file_wicket_create (&wicket, filename)) == 0)
-	{
-	  mu_ticket_t ticket;
-      
-	  if ((rc = mu_wicket_get_ticket (wicket, NULL, &ticket)) == 0)
-	    {
-	      rc = mu_authority_set_ticket (auth, ticket);
-	      mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_TRACE1,
-			("Retrieved and set ticket: %d", rc));
-	    }
-	  else
-	    mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
-		      ("Error retrieving ticket: %s\n",
-		       mu_strerror (rc)));
-	  mu_wicket_destroy (&wicket);
-	}
-      else
-        mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
-		  ("Error creating wicket: %s\n", mu_strerror (rc)));
-      free (filename);
-    }
+  if ((rc = mu_mailbox_get_folder (mbox, &folder)) == 0)
+    rc = mu_folder_attach_ticket (folder);
+  return rc;
 }
 
 /* Expand mailbox name according to the following rules:
@@ -490,7 +461,7 @@ mu_mailbox_create_default (mu_mailbox_t *pmbox, const char *mail)
   status = mu_mailbox_create (pmbox, mboxname);
   free (mboxname);
   if (status == 0)
-    attach_auth_ticket (*pmbox);
+    mu_mailbox_attach_ticket (*pmbox);
       
   return status;
 }