Changeset 1383:48430ce6f7b2

Timestamp:

1999-11-22 08:01:39 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

IMAP folder creation and deletion. From Brendan Cully.

Files:

• OPS (modified) (3 diffs)
• browser.c (modified) (3 diffs)
• functions.h (modified) (1 diff)
• imap/BUGS (modified) (2 diffs)
• imap/README (modified) (1 diff)
• imap/TODO (modified) (3 diffs)
• imap/imap.c (modified) (3 diffs)
• imap/imap.h (modified) (1 diff)
• imap/imap_private.h (modified) (1 diff)
• imap/message.c (modified) (1 diff)
• imap/util.c (modified) (5 diffs)
• pgppubring.c (modified) (1 diff)

OPS

@@ -7 +7 @@
 OP_BROWSER_VIEW_FILE "view file"
 OP_BROWSER_TELL "display the currently selected file's name"
-OP_BROWSER_SUBSCRIBE "subscribe to current mailbox (IMAP Only)"
-OP_BROWSER_UNSUBSCRIBE "unsubscribe to current mailbox (IMAP Only)"
-OP_BROWSER_TOGGLE_LSUB "toggle view all/subscribed mailboxes (IMAP Only)"
+OP_BROWSER_SUBSCRIBE "subscribe to current mailbox (IMAP only)"
+OP_BROWSER_UNSUBSCRIBE "unsubscribe to current mailbox (IMAP only)"
+OP_BROWSER_TOGGLE_LSUB "toggle view all/subscribed mailboxes (IMAP only)"
 OP_CHANGE_DIRECTORY "change directories"
 OP_CHECK_NEW "check mailboxes for new mail"
@@ -48 +48 @@
 OP_DECODE_SAVE "make decoded copy (text/plain) and delete"
 OP_DELETE "delete the current entry"
+OP_DELETE_MAILBOX "delete the current mailbox (IMAP only)"
 OP_DELETE_SUBTHREAD "delete all messages in subthread"
 OP_DELETE_THREAD "delete all messages in thread"
@@ -113 +114 @@
 OP_MAIN_UNTAG_PATTERN "untag messages matching a pattern"
 OP_MIDDLE_PAGE "move to the middle of the page"
+OP_NEW_MAILBOX "create a new mailbox (IMAP only)"
 OP_NEXT_ENTRY "move to the next entry"
 OP_NEXT_LINE "scroll down one line"

browser.c

@@ -338 +338 @@
   state->entry = (struct folder_file *) safe_malloc (sizeof (struct folder_file) * state->entrymax);
   memset (state->entry, 0, sizeof (struct folder_file) * state->entrymax);
+#ifdef USE_IMAP
+  state->imap_browse = 0;
+#endif
   if (menu)
     menu->data = state->entry;
@@ -597 +600 @@
     menu->tag = file_tag;
 
-  menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER, FolderHelp);
+  menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
+    FolderHelp);
 
   init_menu (&state, menu, title, sizeof (title), buffy);
@@ -794 +798 @@
         mutt_ungetch (0, OP_CHECK_NEW);
         break;
+
+      case OP_NEW_MAILBOX:
+        mutt_error (_("Creating mailboxes is not yet supported."));
+        break;
+
+      case OP_DELETE_MAILBOX:
+        if (!mx_is_imap (state.entry[menu->current].name))
+          mutt_error (_("Delete is only supported for IMAP mailboxes"));
+        else
+        {
+          char msg[LONG_STRING];
+          char* mbox;
+          int nentry = menu->current;
+          
+          imap_parse_path (state.entry[nentry].name, NULL, 0, NULL,
+            NULL, &mbox);
+          snprintf (msg, sizeof (msg), _("Really delete mailbox \"%s\"?"),
+            mbox);
+          if (mutt_yesorno (msg, M_NO) == M_YES)
+          {
+            if (!imap_delete_mailbox (Context, mbox))
+            {
+              /* free the mailbox from the browser */
+              safe_free ((void **) &((state.entry)[nentry].name));
+              safe_free ((void **) &((state.entry)[nentry].desc));
+              /* and move all other entries up */
+              if (nentry+1 < state.entrylen)
+                memmove (state.entry + nentry, state.entry + nentry + 1,
+                  sizeof (struct folder_file) * (state.entrylen - (nentry+1)));
+              state.entrylen--;
+              mutt_message _("Mailbox deleted.");
+              init_menu (&state, menu, title, sizeof (title), buffy);
+              MAYBE_REDRAW (menu->redraw);
+            }
+          }
+          else
+            mutt_message _("Mailbox not deleted.");
+        }
+        break;
 #endif
       

functions.h

@@ -328 +328 @@
   { "view-file",        OP_BROWSER_VIEW_FILE,   " " },
 #ifdef USE_IMAP
+  { "new-mailbox",      OP_NEW_MAILBOX,         "n" },
+  { "delete-mailbox",   OP_DELETE_MAILBOX,      "d" },
   { "subscribe",        OP_BROWSER_SUBSCRIBE,   "s" },
   { "unsubscribe",      OP_BROWSER_UNSUBSCRIBE, "u" },

imap/BUGS

@@ -1 +1 @@
 In no particular order:
+
+* Mutt doesn't detect when a mailbox has only been opened read-only
+  (because, say, another process has it open), so it lets you store
+  changes that it can't commit.
+  --> just pick up the [READ-ONLY] in the tagged response, set mutt's flag
+
+* ~h searches download the entire folder, setting everything to \Seen in
+  the process.
+  --> Use SEARCH? or at least try to use .PEEK when doing scans. I've been
+      thinking of going to always PEEK anyway, but then you'd have to store
+      updates for every message you touched. Maybe a config option?
 
 * No checks are performed on long commands to make sure that they are
@@ -41 +52 @@
 
 Brendan Cully <brendan@kublai.com>
-Updated 19991102
+Updated 19991110

imap/README

@@ -26 +26 @@
 * Preserve message keywords
 * Preserve deleted messages if you don't choose to expunge them
+* Delete mailboxes (from the browser)

imap/TODO

@@ -28 +28 @@
   PRIORITY: [** ]
 
+* See if we can't add more info to the IMAP browser than just name (without
+  incurring too much overhead). eg which folders contain new mail, size,
+  number of messages.
+
+  PRIORITY: [** ]
+
 [ -- speed -- ]
 * Persistent caching of data. I think the nicest way to do this is to store
@@ -42 +48 @@
     the server changes its file format, bad things might happen. Could be
     worked around with a specific Mutt header in all messages, probably.
+
+  PRIORITY: [*  ]
+
+* Instead of testing for the existence of a mailbox for APPEND, just append
+  and create/retry on failure. This is only a small bandwidth savings, but
+  it should be easy.
 
   PRIORITY: [*  ]
@@ -61 +73 @@
 
 Brendan Cully <brendan@kublai.com>
-Updated: 19990911
+Updated: 19991119

imap/imap.c

@@ -43 +43 @@
 static int imap_check_capabilities (IMAP_DATA *idata);
 
+int imap_create_mailbox (CONTEXT* ctx, char* mailbox)
+{
+  char buf[LONG_STRING], mbox[LONG_STRING];
+
+  imap_quote_string (mbox, sizeof (mbox), mailbox);
+  snprintf (buf, sizeof (buf), "CREATE %s", mbox);
+      
+  if (imap_exec (buf, sizeof (buf), CTX_DATA, buf, 0) != 0)
+  {
+    imap_error ("imap_create_mailbox()", buf);
+    return -1;
+  }
+  return 0;
+}
+
+int imap_delete_mailbox (CONTEXT* ctx, char* mailbox)
+{
+  char buf[LONG_STRING], mbox[LONG_STRING];
+  
+  imap_quote_string (mbox, sizeof (mbox), mailbox);
+  snprintf (buf, sizeof (buf), "DELETE %s", mbox);
+
+  if (imap_exec (buf, sizeof (buf), CTX_DATA, buf, 0) != 0)
+  {
+    imap_error ("imap_delete_mailbox", buf);
+    return -1;
+  }
+
+  return 0;
+}
+
 void imap_set_logout (CONTEXT *ctx)
 {
@@ -713 +744 @@
 }
 
-int imap_create_mailbox (IMAP_DATA* idata, char* mailbox)
-{
-  char buf[LONG_STRING], mbox[LONG_STRING];
-
-  imap_quote_string (mbox, sizeof (mbox), mailbox);
-  snprintf (buf, sizeof (buf), "CREATE %s", mbox);
-      
-  if (imap_exec (buf, sizeof (buf), idata, buf, 0) != 0)
-  {
-    imap_error ("imap_create_mailbox()", buf);
-    return (-1);
-  }
-  return 0;
-}
-
 int imap_open_mailbox_append (CONTEXT *ctx)
 {
@@ -799 +815 @@
         return (-1);
       }
-      if (imap_create_mailbox (idata, mailbox) < 0)
+      if (imap_create_mailbox (ctx, mailbox) < 0)
       {
         return (-1);

imap/imap.h

@@ -23 +23 @@
 #include "mailbox.h"
 
+/* imap.c */
 int imap_check_mailbox (CONTEXT *ctx, int *index_hint);
+int imap_create_mailbox (CONTEXT* idata, char* mailbox);
 int imap_close_connection (CONTEXT *ctx);
+int imap_delete_mailbox (CONTEXT* idata, char* mailbox);
 int imap_open_mailbox (CONTEXT *ctx);
 int imap_open_mailbox_append (CONTEXT *ctx);

imap/imap_private.h

@@ -150 +150 @@
 /* -- private IMAP functions -- */
 /* imap.c */
-int imap_create_mailbox (IMAP_DATA* idata, char* mailbox);
 int imap_make_msg_set (char* buf, size_t buflen, CONTEXT* ctx, int flag,
   int changed);

imap/message.c

@@ -581 +581 @@
         return -1;
       }
-      if (imap_create_mailbox (CTX_DATA, mbox) < 0)
+      if (imap_create_mailbox (ctx, mbox) < 0)
         return -1;
     }

imap/util.c

@@ -129 +129 @@
 
   /* set default port */
-  *port = 0;
+  if (port)
+    *port = 0;
   if (socktype)
     *socktype = M_NEW_SOCKET;
@@ -136 +137 @@
     return -1;
   pc++;
-  n = 0;
-  while (*pc && *pc != '}' && *pc != ':' && *pc != '/' && (n < hlen-1))
-    host[n++] = *pc++;
-  host[n] = 0;
-  /* catch NULL hosts */
-  if (!*host)
+  /* skip over the entire host, but copy in only what we have room for */
+  for (n = 0; *pc && *pc != '}' && *pc != ':' && *pc != '/'; pc++)
+    if (n+1 < hlen)
+      host[n++] = *pc;
+  if (hlen)
+    host[n] = 0;
+
+  /* catch NULL hosts, unless we're deliberately not parsing them */
+  if (hlen && !*host)
   {
     dprint (1, (debugfile, "imap_parse_path: NULL host in %s\n", path));
@@ -158 +162 @@
     c = *pc;
     *pc = '\0';
-    *port = atoi (pt);
-    if (!port)
+    if (port)
+      *port = atoi (pt);
+    if (port && !*port)
     {
       dprint (1, (debugfile, "imap_parse_path: bad port in %s\n", path));
@@ -179 +184 @@
       if (socktype)
         *socktype = M_NEW_SSL_SOCKET;
-      if (!*port)
+      if (port && !*port)
         *port = IMAP_SSL_PORT;
     } else
@@ -188 +193 @@
   pc++;
   
-  if (!*port)
+  if (port && !*port)
     *port = IMAP_PORT;
   

pgppubring.c

@@ -134 +134 @@
   }
   
-  pgpring_find_candidates (kring, argv + optind, argc - optind);
+  pgpring_find_candidates (kring, (const char**) argv + optind, argc - optind);
     
   return 0;