Changeset 367:7a3e51056fb3

Timestamp:

1998-08-22 06:35:23 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-0-94

Message:

[patch-0.94.3.bl.imap_buffy.1] Adding Brandon's IMAP buffy
support.

Files:

• BUGS (modified) (1 diff)
• browser.c (modified) (4 diffs)
• buffy.c (modified) (3 diffs)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• curs_lib.c (modified) (2 diffs)
• imap.c (modified) (31 diffs)
• imap.h (modified) (1 diff)
• mailbox.h (modified) (1 diff)
• mutt.h (modified) (2 diffs)
• mx.c (modified) (1 diff)
• socket.c (added)

BUGS

@@ -39 +39 @@
   matching nametemplates exist.
 
+- mutt_gen_msgid() should _always_ rely on the real FQDN,
+  regardless of the hidden_domain feature.

browser.c

@@ -157 +157 @@
   struct passwd *pw;
   struct group *gr;
- 
+
   switch (op)
   {
     case 'd':
-      tnow = time (NULL);
-      t_fmt = tnow - folder->f->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
-      strftime (date, sizeof (date), t_fmt, localtime (&folder->f->st_mtime));
-      snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-      snprintf (dest, destlen, tmp, date);
+      if (folder->f != NULL)
+      {
+        tnow = time (NULL);
+        t_fmt = tnow - folder->f->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d  %Y";
+        strftime (date, sizeof (date), t_fmt, localtime (&folder->f->st_mtime));
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, date);
+      }
+      else
+      {
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, "");
+      }
       break;
     case 'f':
       strncpy (fn, folder->name, sizeof(fn) - 1);
-      strcat (fn, S_ISLNK (folder->f->st_mode) ? "@" : 
-              (S_ISDIR (folder->f->st_mode) ? "/" : 
-               ((folder->f->st_mode & S_IXUSR) != 0 ? "*" : "")));
+      if (folder->f != NULL)
+      {
+        strcat (fn, S_ISLNK (folder->f->st_mode) ? "@" : 
+                (S_ISDIR (folder->f->st_mode) ? "/" : 
+                 ((folder->f->st_mode & S_IXUSR) != 0 ? "*" : "")));
+      }
       snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
       snprintf (dest, destlen, tmp, fn);
       break;
     case 'F':
-      sprintf (permission, "%c%c%c%c%c%c%c%c%c%c",
-               S_ISDIR(folder->f->st_mode) ? 'd' : (S_ISLNK(folder->f->st_mode) ? 'l' : '-'),
-               (folder->f->st_mode & S_IRUSR) != 0 ? 'r': '-',
-               (folder->f->st_mode & S_IWUSR) != 0 ? 'w' : '-',
-               (folder->f->st_mode & S_ISUID) != 0 ? 's' : (folder->f->st_mode & S_IXUSR) != 0 ? 'x': '-',
-               (folder->f->st_mode & S_IRGRP) != 0 ? 'r' : '-',
-               (folder->f->st_mode & S_IWGRP) != 0 ? 'w' : '-',
-               (folder->f->st_mode & S_ISGID) != 0 ? 's' : (folder->f->st_mode & S_IXGRP) != 0 ? 'x': '-',
-               (folder->f->st_mode & S_IROTH) != 0 ? 'r' : '-',
-               (folder->f->st_mode & S_IWOTH) != 0 ? 'w' : '-',
-               (folder->f->st_mode & S_ISVTX) != 0 ? 't' : (folder->f->st_mode & S_IXOTH) != 0 ? 'x': '-');
-      snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-      snprintf (dest, destlen, tmp, permission);
+      if (folder->f != NULL)
+      {
+        sprintf (permission, "%c%c%c%c%c%c%c%c%c%c",
+                 S_ISDIR(folder->f->st_mode) ? 'd' : (S_ISLNK(folder->f->st_mode) ? 'l' : '-'),
+                 (folder->f->st_mode & S_IRUSR) != 0 ? 'r': '-',
+                 (folder->f->st_mode & S_IWUSR) != 0 ? 'w' : '-',
+                 (folder->f->st_mode & S_ISUID) != 0 ? 's' : (folder->f->st_mode & S_IXUSR) != 0 ? 'x': '-',
+                 (folder->f->st_mode & S_IRGRP) != 0 ? 'r' : '-',
+                 (folder->f->st_mode & S_IWGRP) != 0 ? 'w' : '-',
+                 (folder->f->st_mode & S_ISGID) != 0 ? 's' : (folder->f->st_mode & S_IXGRP) != 0 ? 'x': '-',
+                 (folder->f->st_mode & S_IROTH) != 0 ? 'r' : '-',
+                 (folder->f->st_mode & S_IWOTH) != 0 ? 'w' : '-',
+                 (folder->f->st_mode & S_ISVTX) != 0 ? 't' : (folder->f->st_mode & S_IXOTH) != 0 ? 'x': '-');
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, permission);
+      }
+      else
+      {
+#ifdef USE_IMAP
+        if (strchr(folder->name, '{'))
+        {
+          snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+          snprintf (dest, destlen, tmp, "IMAP");
+        }                                        
+#endif
+      }
       break;
     case 'g':
-      if ((gr = getgrgid (folder->f->st_gid)))
+      if (folder->f != NULL)
+      {
+        if ((gr = getgrgid (folder->f->st_gid)))
+        {
+          snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+          snprintf (dest, destlen, tmp, gr->gr_name);
+        }
+        else
+        {
+          snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
+          snprintf (dest, destlen, tmp, folder->f->st_gid);
+        }
+      }
+      else
       {
         snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-        snprintf (dest, destlen, tmp, gr->gr_name);
+        snprintf (dest, destlen, tmp, "");
+      }
+      break;
+    case 'l':
+      if (folder->f != NULL)
+      {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, folder->f->st_nlink);
       }
       else
       {
-        snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-        snprintf (dest, destlen, tmp, folder->f->st_gid);
-      }
-      break;
-    case 'l':
-      snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
-      snprintf (dest, destlen, tmp, folder->f->st_nlink);
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, "");
+      }
       break;
     case 'N':
@@ -211 +251 @@
       break;
     case 's':
-      snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-      snprintf (dest, destlen, tmp, (long) folder->f->st_size);
+      if (folder->f != NULL)
+      {
+        snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
+        snprintf (dest, destlen, tmp, (long) folder->f->st_size);
+      }
+      else
+      {
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, "");
+      }
       break;
     case 'u':
-      if ((pw = getpwuid (folder->f->st_uid)))
+      if (folder->f != NULL)
+      {
+        if ((pw = getpwuid (folder->f->st_uid)))
+        {
+          snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+          snprintf (dest, destlen, tmp, pw->pw_name);
+        }
+        else
+        {
+          snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
+          snprintf (dest, destlen, tmp, folder->f->st_uid);
+        }
+      }
+      else
       {
         snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-        snprintf (dest, destlen, tmp, pw->pw_name);
-      }
-      else
-      {
-        snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-        snprintf (dest, destlen, tmp, folder->f->st_uid);
+        snprintf (dest, destlen, tmp, "");
       }
       break;
@@ -251 +307 @@
   }
 
+  if (s != NULL)
+  {
   (state->entry)[state->entrylen].mode = s->st_mode;
   (state->entry)[state->entrylen].mtime = s->st_mtime;
   (state->entry)[state->entrylen].size = s->st_size;
+  }
   (state->entry)[state->entrylen].name = safe_strdup (name);
   (state->entry)[state->entrylen].desc = safe_strdup (buffer);
@@ -342 +401 @@
   do
   {
+#ifdef USE_IMAP
+    if (tmp->path[0] == '{')
+    {
+      add_folder (menu, state, tmp->path, NULL, tmp->new);
+      continue;
+    }
+#endif
     if (lstat (tmp->path, &s) == -1)
       continue;

buffy.c

@@ -21 +21 @@
 #include "mx.h"
 #include "mailbox.h"
+#ifdef USE_IMAP
+#include "imap.h"
+#endif
 
 #include <string.h>
@@ -243 +246 @@
     tmp->new = 0;
 
+#ifdef USE_IMAP
+    if ((tmp->magic == M_IMAP) || mx_is_imap (tmp->path))
+    {
+      tmp->magic = M_IMAP;
+    }
+    else
+#endif
     if (stat (tmp->path, &sb) != 0 ||
         (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
@@ -317 +327 @@
         }
         break;
+
+#ifdef USE_IMAP
+      case M_IMAP:
+        if (imap_buffy_check (tmp->path) > 0)
+        {
+          BuffyCount++;
+          tmp->new = 1;
+        }
+        break;
+#endif
       }
     }

configure

@@ -2940 +2940 @@
 fi
 
-        LIBOBJS="$LIBOBJS imap.o"
+        LIBOBJS="$LIBOBJS imap.o socket.o"
 
 fi

configure.in

@@ -393 +393 @@
         AC_CHECK_LIB(socket, socket)
         AC_CHECK_LIB(nsl, gethostbyname)
-        LIBOBJS="$LIBOBJS imap.o"
+        LIBOBJS="$LIBOBJS imap.o socket.o"
 ])
 

curs_lib.c

@@ -179 +179 @@
   va_end (ap);
   
+  dprint (1, (debugfile, "%s\n", Errorbuf));
   Errorbuf[ (COLS < sizeof (Errorbuf) ? COLS : sizeof (Errorbuf)) - 2 ] = 0;
 
@@ -233 +234 @@
   char *p = strerror (errno);
 
+  dprint (1, (debugfile, "%s: %s (errno = %d)\n", s, 
+      p ? p : "unknown error", errno));
   mutt_error ("%s: %s (errno = %d)", s, p ? p : "unknown error", errno);
 }

imap.c

@@ -22 +22 @@
 #include "mailbox.h"
 #include "globals.h"
+#include "mutt_socket.h"
 
 #include <unistd.h>
@@ -48 +49 @@
   IMAP_EXPUNGE,
   IMAP_BYE,
-  IMAP_OK_FAIL,
-  IMAP_OPEN_NEW
+  IMAP_OK_FAIL
 };
 
 typedef struct
 {
-  char *server;
-  int uses;
-  int fd;
-  char inbuf[LONG_STRING];
-  int bufpos;
-  int available;
-} CONNECTION;
-
-typedef struct
-{
-  int index;
+  unsigned int index;
   char *path;
 } IMAP_CACHE;
@@ -71 +61 @@
 {
   short status;
-  unsigned short sequence;
   unsigned short newMailCount;
   char *mailbox;
@@ -81 +70 @@
 #define CTX_DATA ((IMAP_DATA *) ctx->data)
 
-static CONNECTION *Connections = NULL;
-static int NumConnections = 0;
-
 /* Linked list to hold header information while downloading message
  * headers
@@ -101 +87 @@
 } IMAP_HEADER_INFO;
 
-/* simple read buffering to speed things up. */
-static int imap_readchar (CONNECTION *conn, char *c)
-{
-  if (conn->bufpos >= conn->available)
-  {
-    conn->available = read (conn->fd, conn->inbuf, 
-                            sizeof(LONG_STRING) > SSIZE_MAX ? SSIZE_MAX : sizeof(LONG_STRING));
-    conn->bufpos = 0;
-    if (conn->available <= 0)
-      return conn->available; /* returns 0 for EOF or -1 for other error */
-  }
-  *c = conn->inbuf[conn->bufpos];
-  conn->bufpos++;
-  return 1;
-}
-
-static int imap_read_line (char *buf, size_t buflen, CONNECTION *conn)
-{
-  char ch;
-  int i;
-
-  for (i = 0; i < buflen; i++)
-  {
-    if (imap_readchar (conn, &ch) != 1)
-      return (-1);
-    if (ch == '\n')
-      break;
-    buf[i] = ch;
-  }
-  buf[i-1] = 0;
-  return (i + 1);
-}
-
-static int imap_read_line_d (char *buf, size_t buflen, CONNECTION *conn)
-{
-  int r = imap_read_line (buf, buflen, conn);
-  dprint (1,(debugfile,"imap_read_line_d():%s\n", buf));
-  return r;
-}
-
-static void imap_make_sequence (char *buf, size_t buflen, CONTEXT *ctx)
-{
-  snprintf (buf, buflen, "a%04d", CTX_DATA->sequence++);
-}
-
-static int imap_write (CONNECTION *conn, const char *buf)
-{
-  dprint (1,(debugfile,"imap_write():%s", buf));
-  return (write (conn->fd, buf, strlen (buf)));
-}
+
+static void imap_make_sequence (char *buf, size_t buflen)
+{
+  static int sequence = 0;
+  
+  snprintf (buf, buflen, "a%04d", sequence++);
+}
+
 
 static void imap_error (const char *where, const char *msg)
 {
   mutt_error ("imap_error(): unexpected response in %s: %s\n", where, msg);
-}
-
-static CONNECTION *imap_select_connection (char *host, int flags)
-{
-  int x;
-
-  if (flags != IMAP_OPEN_NEW)
-  {
-    for (x = 0; x < NumConnections; x++)
-    {
-      if (!strcmp (host, Connections[x].server))
-        return &Connections[x];
-    }
-  }
-  if (NumConnections == 0)
-  {
-    NumConnections = 1;
-    Connections = (CONNECTION *) safe_malloc (sizeof (CONNECTION));
-  }
-  else
-  {
-    NumConnections++;
-    safe_realloc ((void *)&Connections, sizeof (CONNECTION) * NumConnections);
-  }
-  Connections[NumConnections - 1].bufpos = 0;
-  Connections[NumConnections - 1].available = 0;
-  Connections[NumConnections - 1].uses = 0;
-  Connections[NumConnections - 1].server = safe_strdup (host);
-
-  return &Connections[NumConnections - 1];
 }
 
@@ -353 +267 @@
   for (pos = 0; pos < bytes; )
   {
-    len = imap_read_line (buf, sizeof (buf), conn);
+    len = mutt_socket_read_line (buf, sizeof (buf), conn);
     if (len < 0)
       return (-1);
@@ -485 +399 @@
     if (msgno + 1 > fetchlast)
     {
-      imap_make_sequence (seq, sizeof (seq), ctx);
+      imap_make_sequence (seq, sizeof (seq));
       /*
        * Make one request for everything. This makes fetching headers an
@@ -494 +408 @@
        */
       snprintf (buf, sizeof (buf), "%s FETCH %d:%d (FLAGS INTERNALDATE RFC822.SIZE BODY.PEEK[HEADER.FIELDS (DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE IN-REPLY-TO REPLY-TO)])\r\n", seq, msgno + 1, msgend + 1);
-      imap_write (CTX_DATA->conn, buf);
+      mutt_socket_write (CTX_DATA->conn, buf);
       fetchlast = msgend + 1;
     }
@@ -500 +414 @@
     do
     {
-      if (imap_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
+      if (mutt_socket_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
       {
         return (-1);
@@ -540 +454 @@
 
             imap_read_bytes (fp, CTX_DATA->conn, bytes);
-            if (imap_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
+            if (mutt_socket_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
             {
               return (-1);
@@ -614 +528 @@
   int count;
 
-  imap_write (CTX_DATA->conn, cmd);
+  mutt_socket_write (CTX_DATA->conn, cmd);
 
   do
   {
-    if (imap_read_line_d (buf, buflen, CTX_DATA->conn) < 0)
+    if (mutt_socket_read_line_d (buf, buflen, CTX_DATA->conn) < 0)
       return (-1);
 
@@ -658 +572 @@
   }
 
+  return 0;
+}
+
+static int imap_parse_path (char *path, char *host, size_t hlen, char **mbox)
+{
+  int n;
+  char *pc;
+
+  pc = path;
+  if (*pc != '{')
+    return (-1);
+  pc++;
+  n = 0;
+  while (*pc && *pc != '}' && (n < hlen-1))
+    host[n++] = *pc++;
+  host[n] = 0;
+  if (!*pc)
+    return (-1);
+  pc++;
+
+  *mbox = pc;
   return 0;
 }
@@ -700 +635 @@
   }
 
-  if (imap_read_line_d (buf, sizeof (buf), conn) < 0)
+  if (mutt_socket_read_line_d (buf, sizeof (buf), conn) < 0)
   {
     close (conn->fd);
@@ -735 +670 @@
 
     mutt_message ("Logging in...");
-    /* sequence numbers are currently context dependent, so just make one
-     * up for this first access to the server */
-    strcpy (seq, "l0000");
+    imap_make_sequence (seq, sizeof (seq));
     snprintf (buf, sizeof (buf), "%s LOGIN %s %s\r\n", seq, user, pass);
     if (imap_exec (buf, sizeof (buf), ctx, seq, buf, 0) != 0)
@@ -767 +700 @@
   char host[SHORT_STRING];
   char seq[16];
+  char *pc = NULL;
   int count = 0;
   int n;
-  char *pc;
-
-  pc = ctx->path;
-  if (*pc != '{')
-    return (-1);
-  pc++;
-  n = 0;
-  while (*pc && *pc != '}')
-    host[n++] = *pc++;
-  host[n] = 0;
-  if (!*pc)
-    return (-1);
-  pc++;
+
+  if (imap_parse_path (ctx->path, host, sizeof (host), &pc))
+    return (-1);
 
   /* create IMAP-specific state struct */
@@ -789 +713 @@
   CTX_DATA->mailbox = safe_strdup (pc);
 
-  conn = imap_select_connection (host, IMAP_OPEN_NEW);
+  conn = mutt_socket_select_connection (host, IMAP_PORT, M_NEW_SOCKET);
   CTX_DATA->conn = conn;
 
@@ -798 +722 @@
 
   mutt_message ("Selecting %s...", CTX_DATA->mailbox);
-  imap_make_sequence (seq, sizeof (seq), ctx);
+  imap_make_sequence (seq, sizeof (seq));
   snprintf (bufout, sizeof (bufout), "%s SELECT %s\r\n", seq, CTX_DATA->mailbox);
-  imap_write (CTX_DATA->conn, bufout);
+  mutt_socket_write (CTX_DATA->conn, bufout);
 
   do
   {
-    if (imap_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
+    if (mutt_socket_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
       break;
 
@@ -843 +767 @@
   char buf[LONG_STRING];
 
-  imap_make_sequence (seq, sizeof (seq), ctx);
+  imap_make_sequence (seq, sizeof (seq));
   snprintf (buf, sizeof (buf), "%s CREATE %s\r\n", seq, CTX_DATA->mailbox);
       
@@ -860 +784 @@
   char buf[LONG_STRING];
   char seq[16];
-  int n;
   char *pc;
 
-  pc = ctx->path;
-  if (*pc != '{')
-    return (-1);
-  pc++;
-  n = 0;
-  while (*pc && *pc != '}')
-    host[n++] = *pc++;
-  host[n] = 0;
-  if (!*pc)
-    return (-1);
-  pc++;
+  if (imap_parse_path (ctx->path, host, sizeof (host), &pc))
+    return (-1);
 
   /* create IMAP-specific state struct */
@@ -882 +796 @@
   CTX_DATA->mailbox = pc;
 
-  conn = imap_select_connection (host, 0);
+  conn = mutt_socket_select_connection (host, IMAP_PORT, 0);
   CTX_DATA->conn = conn;
 
@@ -892 +806 @@
   /* check mailbox existance */
 
-  imap_make_sequence (seq, sizeof (seq), ctx);
+  imap_make_sequence (seq, sizeof (seq));
   snprintf (buf, sizeof (buf), "%s STATUS %s (UIDVALIDITY)\r\n", seq, 
       CTX_DATA->mailbox);
@@ -955 +869 @@
   }
 
-  imap_make_sequence (seq, sizeof (seq), ctx);
+  imap_make_sequence (seq, sizeof (seq));
   snprintf (buf, sizeof (buf), "%s FETCH %d RFC822\r\n", seq,
             ctx->hdrs[msgno]->index + 1);
-  imap_write (CTX_DATA->conn, buf);
+  mutt_socket_write (CTX_DATA->conn, buf);
   do
   {
-    if (imap_read_line (buf, sizeof (buf), CTX_DATA->conn) < 0)
+    if (mutt_socket_read_line (buf, sizeof (buf), CTX_DATA->conn) < 0)
     {
       return (-1);
@@ -986 +900 @@
         for (pos = 0; pos < bytes; )
         {
-          len = imap_read_line (buf, sizeof (buf), CTX_DATA->conn);
+          len = mutt_socket_read_line (buf, sizeof (buf), CTX_DATA->conn);
           if (len < 0)
             return (-1);
@@ -1039 +953 @@
 
   mutt_message ("Sending APPEND command ...");
-  imap_make_sequence (seq, sizeof (seq), ctx);
+  imap_make_sequence (seq, sizeof (seq));
   snprintf (buf, sizeof (buf), "%s APPEND %s {%d}\r\n", seq, 
       CTX_DATA->mailbox, s.st_size);
 
-  imap_write (CTX_DATA->conn, buf);
+  mutt_socket_write (CTX_DATA->conn, buf);
 
   do 
   {
-    if (imap_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
+    if (mutt_socket_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
     {
       fclose (fp);
@@ -1079 +993 @@
   while (fgets (buf, sizeof (buf), fp) != NULL)
   {
-    imap_write (CTX_DATA->conn, buf);
-  }
-  imap_write (CTX_DATA->conn, "\r\n");
+    mutt_socket_write (CTX_DATA->conn, buf);
+  }
+  mutt_socket_write (CTX_DATA->conn, "\r\n");
   fclose (fp);
 
   do
   {
-    if (imap_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)
+    if (mutt_socket_read_line_d (buf, sizeof (buf), CTX_DATA->conn) < 0)