Add functions for operations on message sets.

* configure.ac: Build libmailutils/msgset/Makefile
* include/mailutils/msgset.h: New file.
* include/mailutils/Makefile.am (pkginclude_HEADERS): Add msgset.h
* include/mailutils/mailutils.h: Include mailutils/msgset.h
* include/mailutils/sys/msgset.h: New file.
* include/mailutils/sys/Makefile.am (sysinclude_HEADERS): Add msgset.h
* include/mailutils/types.hin (mu_msgset_t): New type.
* libmailutils/Makefile.am (SUBDIRS): Add msgset.
(libmailutils_la_LIBADD): Add libmsgset.la
* libmailutils/msgset/Makefile.am: New file.
* libmailutils/msgset/add.c: New file.
* libmailutils/msgset/aggr.c: New file.
* libmailutils/msgset/clear.c: New file.
* libmailutils/msgset/create.c: New file.
* libmailutils/msgset/free.c: New file.
* libmailutils/msgset/getitr.c: New file.
* libmailutils/msgset/getlist.c: New file.
* libmailutils/msgset/locate.c: New file.
* libmailutils/msgset/parse.c: New file.
* libmailutils/msgset/print.c: New file.
* libmailutils/msgset/sub.c: New file.
* libmailutils/tests/msgset.at: New file.
* libmailutils/tests/msgset.c: New file.
* libmailutils/tests/Makefile.am (noinst_PROGRAMS): Add msgset.
(TESTSUITE_AT): Add msgset.at.
* libmailutils/tests/testsuite.at: Include msgset.at.
* testsuite/msgset.c: New file.
* testsuite/Makefile.am (noinst_PROGRAMS): Add msgset.

17 files changed, 1267 insertions, 1 deletions

diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index c01b32176..bbc844768 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -18,7 +18,7 @@
 
 SUBDIRS = \
  auth base address list sockaddr cidr cfg diag\
- filter mailbox mailer mime server string stream stdstream\
+ filter mailbox mailer mime msgset server string stream stdstream\
  property url imapio datetime . tests 
 
 lib_LTLIBRARIES = libmailutils.la
@@ -41,6 +41,7 @@ libmailutils_la_LIBADD = \
  mailbox/libmailbox.la\
  mailer/libmailer.la\
  mime/libmime.la\
+ msgset/libmsgset.la\
  property/libproperty.la\
  server/libserver.la\
  string/libstring.la\
diff --git a/libmailutils/msgset/Makefile.am b/libmailutils/msgset/Makefile.am
new file mode 100644
index 000000000..398806d49
--- /dev/null
+++ b/libmailutils/msgset/Makefile.am
@@ -0,0 +1,34 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libmsgset.la
+
+libmsgset_la_SOURCES = \
+ add.c\
+ aggr.c\
+ clear.c\
+ create.c\
+ getitr.c\
+ getlist.c\
+ free.c\
+ locate.c\
+ parse.c\
+ print.c\
+ sub.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+
diff --git a/libmailutils/msgset/add.c b/libmailutils/msgset/add.c
new file mode 100644
index 000000000..9d9770735
--- /dev/null
+++ b/libmailutils/msgset/add.c
@@ -0,0 +1,43 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   GNU Mailutils is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GNU Mailutils is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+#include <stdlib.h>
+#include <mailutils/types.h>
+#include <mailutils/errno.h>
+#include <mailutils/list.h>
+#include <mailutils/msgset.h>
+#include <mailutils/sys/msgset.h>
+
+int
+mu_msgset_add_range (mu_msgset_t mset, size_t beg, size_t end)
+{
+  int rc;
+  struct mu_msgrange *range;
+  
+  if (!mset || beg == 0)
+    return EINVAL;
+  range = calloc (1, sizeof (*range));
+  if (!range)
+    return ENOMEM;
+  range->msg_beg = beg;
+  range->msg_end = end;
+  rc = mu_list_append (mset->list, range);
+  if (rc)
+    free (range);
+  mset->flags &= ~_MU_MSGSET_AGGREGATED;
+  return rc;
+}
diff --git a/libmailutils/msgset/aggr.c b/libmailutils/msgset/aggr.c
new file mode 100644
index 000000000..a6fe7aa19
--- /dev/null
+++ b/libmailutils/msgset/aggr.c
@@ -0,0 +1,169 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   GNU Mailutils is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GNU Mailutils is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+#include <stdlib.h>
+#include <mailutils/types.h>
+#include <mailutils/errno.h>
+#include <mailutils/list.h>
+#include <mailutils/iterator.h>
+#include <mailutils/msgset.h>
+#include <mailutils/sys/msgset.h>
+
+/* Comparator function for sorting the message set list. */
+static int
+compare_msgrange (const void *a, const void *b)
+{
+  struct mu_msgrange const *sa = a;
+  struct mu_msgrange const *sb = b;
+  
+  if (sa->msg_end != sb->msg_end)
+    {
+      if (sa->msg_end == MU_MSGNO_LAST)
+        return 1;
+      if (sb->msg_end == MU_MSGNO_LAST)
+        return -1;
+    }
+  
+  if (sa->msg_beg < sb->msg_beg)
+    return -1;
+  if (sa->msg_beg > sb->msg_beg)
+    return 1;
+
+  if (sa->msg_end == sb->msg_end)
+    return 0;
+
+  if (sa->msg_end < sb->msg_end)
+    return -1;
+  return 1;
+}
+
+int
+mu_msgset_aggregate (mu_msgset_t mset)
+{
+  int rc;
+  mu_iterator_t itr;
+  size_t count;
+  struct mu_msgrange *prev = NULL, *mr;
+  int dir;
+  
+  if (!mset)
+    return EINVAL;
+
+  if (mset->flags & _MU_MSGSET_AGGREGATED)
+    return 0; /* nothing to do */
+  
+  rc = mu_list_count (mset->list, &count);
+  if (rc)
+    return rc;
+  if (count < 2)
+    return 0;
+  
+  mu_list_sort (mset->list, compare_msgrange);
+  
+  rc = mu_list_get_iterator (mset->list, &itr);
+  if (rc)
+    return rc;
+  /* Set backward direction */
+  dir = 1;
+  rc = mu_iterator_ctl (itr, mu_itrctl_set_direction, &dir);
+  if (rc)
+    {
+      mu_iterator_destroy (&itr);
+      return rc;
+    }
+
+  mu_iterator_first (itr);
+  mu_iterator_current (itr, (void **)&mr);