Andreas Krennmair:

	integrated Florian Weimer's maildir sort patch and a little pgpewrap fix.

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@24 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng
index ab944bf..6664c0e 100644 (file)
--- a/ChangeLog.mutt-ng
+++ b/ChangeLog.mutt-ng
@@ -6,6 +6,8 @@ Changes specific to mutt-ng:
     * edit-threads patch
     * gnutls patch including integration into configure script, i.e. the user
       can select between OpenSSL and GNU TLS.
     * edit-threads patch
     * gnutls patch including integration into configure script, i.e. the user
       can select between OpenSSL and GNU TLS.

+    * Florian Weimer's sort maildir entries by inode number patch
+    * little pgpewrap fix

   * Corrected email addresses et al.
 
 2004-01-14:
   * Corrected email addresses et al.
 
 2004-01-14:

diff --git a/PATCHES b/PATCHES
index 9919b30..add26e8 100644 (file)
--- a/PATCHES
+++ b/PATCHES
@@ -1,4 +1,5 @@
 rr.compressed
 rr.compressed

+patch-1.5.4.fw.maildir_inode_sort

 patch-1.4.admcd.gnutls.59d
 patch-1.5.5.1.cd.edit_threads.9.5
 patch-1.5.6i.sidebar.20041122
 patch-1.4.admcd.gnutls.59d
 patch-1.5.5.1.cd.edit_threads.9.5
 patch-1.5.6i.sidebar.20041122

diff --git a/mh.c b/mh.c
index 0c76fee..04b11ae 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -30,6 +30,7 @@
 #include "sort.h"
 
 #include <sys/stat.h>
 #include "sort.h"
 
 #include <sys/stat.h>

+#include <sys/types.h>

 #include <dirent.h>
 #include <limits.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <limits.h>
 #include <unistd.h>


@@ -47,6 +48,7 @@ struct maildir
   HEADER *h;
   char *canon_fname;
   unsigned header_parsed:1;
   HEADER *h;
   char *canon_fname;
   unsigned header_parsed:1;

+  ino_t inode;

   struct maildir *next;
 };
 
   struct maildir *next;
 };
 


@@ -626,7 +628,7 @@ static HEADER *maildir_parse_message (int magic, const char *fname,
 
 static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
                                const char *subdir, const char *fname,
 
 static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
                                const char *subdir, const char *fname,

-                               int *count, int is_old)
+                               int *count, int is_old, ino_t inode)

 {
   struct maildir *entry;
   HEADER *h = NULL;
 {
   struct maildir *entry;
   HEADER *h = NULL;


@@ -666,6 +668,7 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
     entry = safe_calloc (sizeof (struct maildir), 1);
     entry->h = h;
     entry->header_parsed = (ctx->magic == M_MH);
     entry = safe_calloc (sizeof (struct maildir), 1);
     entry->h = h;
     entry->header_parsed = (ctx->magic == M_MH);

+    entry->inode = inode;

     **last = entry;
     *last = &entry->next;
 
     **last = entry;
     *last = &entry->next;
 


@@ -723,7 +726,8 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
     dprint (2,
            (debugfile, "%s:%d: parsing %s\n", __FILE__, __LINE__,
             de->d_name));
     dprint (2,
            (debugfile, "%s:%d: parsing %s\n", __FILE__, __LINE__,
             de->d_name));

-    maildir_parse_entry (ctx, last, subdir, de->d_name, count, is_old);
+    maildir_parse_entry (ctx, last, subdir, de->d_name, count, is_old, 
+                        de->d_ino);

   }
 
   closedir (dirp);
   }
 
   closedir (dirp);


@@ -779,6 +783,94 @@ static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md)
   return r;
 }
 
   return r;
 }
 

+/*
+ * Merge two maildir lists according to the inode numbers.
+ */
+static struct maildir*  maildir_merge_inode (struct maildir *left,
+                                            struct maildir *right)
+{
+  struct maildir* head;
+  struct maildir* tail;
+
+  if (left && right) 
+  {
+    if (left->inode < right->inode)
+    {
+      head = left;
+      left = left->next;
+    }
+    else 
+    {
+      head = right;
+      right = right->next;
+    }
+  } 
+  else 
+  {
+    if (left) 
+      return left;
+    else 
+      return right;
+  }
+    
+  tail = head;
+
+  while (left && right) 
+  {
+    if (left->inode < right->inode) 
+    {
+      tail->next = left;
+      left = left->next;
+    } 
+    else 
+    {
+      tail->next = right;
+      right = right->next;
+    }
+    tail = tail->next;
+  }
+
+  if (left) 
+  {
+    tail->next = left;
+  }
+  else
+  {
+    tail->next = right;
+  }
+
+  return head;
+}
+
+/*
+ * Sort maildir list according to inode.
+ */
+static struct maildir* maildir_sort_inode(struct maildir* list)
+{
+  struct maildir* left = list;
+  struct maildir* right = list;
+
+  if (!list || !list->next) 
+  {
+    return list;
+  }
+
+  list = list->next;
+  while (list && list->next) 
+  {
+    right = right->next;
+    list = list->next->next;
+  }
+
+  list = right;
+  right = right->next;
+  list->next = 0;
+
+  left = maildir_sort_inode(left);
+  right = maildir_sort_inode(right);
+  return maildir_merge_inode(left, right);
+}
+

 
 /* 
  * This function does the second parsing pass for a maildir-style
 
 /* 
  * This function does the second parsing pass for a maildir-style


@@ -835,6 +927,8 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
     mhs_free_sequences (&mhs);
   }
 
     mhs_free_sequences (&mhs);
   }
 

+  md = maildir_sort_inode(md);
+

   if (ctx->magic == M_MAILDIR)
     maildir_delayed_parsing (ctx, md);
 
   if (ctx->magic == M_MAILDIR)
     maildir_delayed_parsing (ctx, md);
 

diff --git a/pgpewrap.c b/pgpewrap.c
index d889483..c15864f 100644 (file)
--- a/pgpewrap.c
+++ b/pgpewrap.c
@@ -10,10 +10,19 @@
 #include <unistd.h>
 #include <string.h>
 
 #include <unistd.h>
 #include <string.h>
 

+void print_usage(const char *progname) {
+       fprintf(stderr, "Command line usage: %s [flags] -- prefix [recipients]\n", progname);
+       exit(1);
+}
+

 int main(int argc, char **argv) {
        char **opts, **opt, *pfx;
        int i;
 
 int main(int argc, char **argv) {
        char **opts, **opt, *pfx;
        int i;
 

+       if (argc <= 1) {
+               print_usage(argv[0]);
+        }
+

        opts = malloc((2 * argc + 1) * sizeof (* opts));        /* __MEM_CHECKED__ */
        if(!opts) {
                perror(argv[0]);
        opts = malloc((2 * argc + 1) * sizeof (* opts));        /* __MEM_CHECKED__ */
        if(!opts) {
                perror(argv[0]);


@@ -36,8 +45,7 @@ int main(int argc, char **argv) {
                if(!strcmp(argv[i], "--")) {
                        i += 2;
                        if(i > argc) {
                if(!strcmp(argv[i], "--")) {
                        i += 2;
                        if(i > argc) {

-                               fprintf(stderr, "Command line usage: %s [flags] -- prefix [recipients]\n", argv[0]);
-                               return 1;
+                               print_usage(argv[0]);

                        }
                        pfx = argv[i-1];
                }
                        }
                        pfx = argv[i-1];
                }