[SCM] GNU Mailutils branch, master, updated. release-2.2-460-g00906d3

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=00906d3b3bcef1a948ceff6f27b6052e47081552

The branch, master has been updated
       via  00906d3b3bcef1a948ceff6f27b6052e47081552 (commit)
       via  1b475f7ea7e8b2d6168622f9bc2dd95950179237 (commit)
      from  c6ed0dbaefd47e4eb961162e6ed103b143f73929 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 00906d3b3bcef1a948ceff6f27b6052e47081552
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 22 13:06:33 2011 +0200

    Bugfixes.
    
    * libmu_dbm/dbm.c (mu_dbm_create_from_url): Parameter list beginning
    with a negative parameter implies default safety criteria.
    Fix semantics of the "default" keyword: it is different from "all".
    * libmu_dbm/mudbm.h (DEFAULT_DBM_SAFETY_FLAGS): Remove.  Not needed now.
    * pop3d/bulletin.c (read_bulletin_db): Remove a leftover call to
    mu_dbm_safety_set_flags.

commit 1b475f7ea7e8b2d6168622f9bc2dd95950179237
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 22 11:54:39 2011 +0200

    Implement new DBM dump format.
    
    The new format, called "C", allows programmers to create input data
    for use by mu load using conventional means.  It represents both key and
    content as C strings (hence its name), with usual C (literal and octal)
    escapes to represent non-printable characters.
    
    * mu/dbm.c (IOBUF_REREAD,IOBUF_EOF): New constants.
    (iobuf) <state>: New member.
    (input_eof): New macro.
    (input_getline): Use iobuf.state to detect EOF.
    (input_ungetline): Reset state only if it is 0.
    (format_tab): New format "C".
    (write_quoted_string,C_writer,C_read_datum)
    (C_reader): New functions to implement the C dump format.
    * libmailutils/tests/testsuite.at: Minor change.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/tests/testsuite.at |    2 +
 libmu_dbm/dbm.c                 |    5 +-
 libmu_dbm/mudbm.h               |    2 -
 mu/dbm.c                        |  203 +++++++++++++++++++++++++++++++++++---
 pop3d/bulletin.c                |    2 -
 5 files changed, 193 insertions(+), 21 deletions(-)

diff --git a/libmailutils/tests/testsuite.at b/libmailutils/tests/testsuite.at
index e29846b..893175d 100644
--- a/libmailutils/tests/testsuite.at
+++ b/libmailutils/tests/testsuite.at
@@ -76,6 +76,8 @@ m4_include([fromflt.at])
 m4_include([inline-comment.at])
 m4_include([hdrflt.at])
 m4_include([linecon.at])
+
+AT_BANNER(Debug Specification)
 m4_include([debugspec.at])
 
 m4_include([fsaf.at])
\ No newline at end of file
diff --git a/libmu_dbm/dbm.c b/libmu_dbm/dbm.c
index 2f3256c..8e76e0d 100644
--- a/libmu_dbm/dbm.c
+++ b/libmu_dbm/dbm.c
@@ -179,6 +179,9 @@ mu_dbm_create_from_url (mu_url_t url, mu_dbm_file_t *db, 
int defsafety)
 
          if (*name == '-')
            {
+             if (!safety_flags_set)
+               /* Imply default safety settings */
+               safety_flags = defsafety;
              negate = 1;
              name++;
            }
@@ -224,7 +227,7 @@ mu_dbm_create_from_url (mu_url_t url, mu_dbm_file_t *db, 
int defsafety)
            }
          else if (strcmp (name, "default") == 0)
            {
-             val = DEFAULT_DBM_SAFETY_FLAGS;
+             val = defsafety;
            }
          else if (mu_file_safety_name_to_code (name, &val))
            return MU_ERR_URL_INVALID_PARAMETER;
diff --git a/libmu_dbm/mudbm.h b/libmu_dbm/mudbm.h
index b52ec21..5546c7c 100644
--- a/libmu_dbm/mudbm.h
+++ b/libmu_dbm/mudbm.h
@@ -28,8 +28,6 @@
     }                                                          \
   while (0)
 
-#define DEFAULT_DBM_SAFETY_FLAGS MU_FILE_SAFETY_ALL
-
 #ifdef WITH_GDBM
 extern struct mu_dbm_impl _mu_dbm_gdbm;
 #endif
diff --git a/mu/dbm.c b/mu/dbm.c
index 212768d..72c1ab7 100644
--- a/mu/dbm.c
+++ b/mu/dbm.c
@@ -209,13 +209,16 @@ set_db_ownership (mu_dbm_file_t db)
 }
 
 
+#define IOBUF_REREAD 1
+#define IOBUF_EOF    2
+
 struct iobuf
 {
   mu_stream_t stream;
   char *buffer;
   size_t bufsize;
   size_t length;
-  int read;
+  int flag;            /* 0 or one of the IOBUF_ constants above. */
 };
 
 static int is_dbm_directive (struct iobuf *input);
@@ -224,15 +227,25 @@ static int is_ignored_directive (const char *name);
 static int set_directive (char *val);
 static void print_header (const char *name, mu_stream_t str);
 
+#define input_eof(iob) ((iob)->flag == IOBUF_EOF)
+
 static int
 input_getline (struct iobuf *inp)
 {
   int rc;
   size_t len;
 
-  if (inp->read)
+  switch (inp->flag)
     {
-      inp->read = 0;
+    case 0:
+      break;
+
+    case IOBUF_REREAD:
+      inp->flag = 0;
+      return 0;
+
+    case IOBUF_EOF:
+      inp->length = 0;
       return 0;
     }
   
@@ -243,6 +256,7 @@ input_getline (struct iobuf *inp)
        return rc;
       if (len == 0)
        {
+         inp->flag = IOBUF_EOF;
          inp->length = 0;
          break;
        }
@@ -270,7 +284,8 @@ input_getline (struct iobuf *inp)
 static void
 input_ungetline (struct iobuf *inp)
 {
-  inp->read = 1;
+  if (inp->flag == 0)
+    inp->flag = IOBUF_REREAD;
 }
 
 static size_t
@@ -298,6 +313,13 @@ static int ascii_writer (struct iobuf *, void *data,
                         struct mu_dbm_datum const *key,
                         struct mu_dbm_datum const *content);
 
+static int C_reader (struct iobuf *, void *data,
+                    struct mu_dbm_datum *key,
+                    struct mu_dbm_datum *content);
+static int C_writer (struct iobuf *, void *data,
+                    struct mu_dbm_datum const *key,
+                    struct mu_dbm_datum const *content);
+
 static void newfmt_init (struct xfer_format *fmt,
                         const char *version, struct iobuf *iop, int wr);
 
@@ -309,14 +331,15 @@ static int newfmt_writer (struct iobuf *, void *data,
                          struct mu_dbm_datum const *content);
 
 static struct xfer_format format_tab[] = {
+  { "C",   NULL, C_reader,     C_writer, NULL },
   { "0.0", NULL, ascii_reader, ascii_writer, NULL },
   { "1.0", newfmt_init, newfmt_reader, newfmt_writer, NULL },
   { NULL }
 };
                                                     
-#define DEFAULT_LIST_FORMAT (&format_tab[0])
-#define DEFAULT_DUMP_FORMAT (&format_tab[1])
-#define DEFAULT_LOAD_FORMAT (&format_tab[0])
+#define DEFAULT_LIST_FORMAT (&format_tab[1])
+#define DEFAULT_DUMP_FORMAT (&format_tab[2])
+#define DEFAULT_LOAD_FORMAT (&format_tab[1])
 
 static struct xfer_format *format;
 static const char *dump_format_version;
@@ -405,8 +428,13 @@ ascii_reader (struct iobuf *inp, void *data MU_ARG_UNUSED,
       mu_error ("%s", mu_strerror (rc));
       return -1;
     }
-  if (input_length (inp) == 0)
+  if (input_eof (inp))
     return 1;
+  if (input_length (inp) == 0)
+    {
+      key->mu_dsize = 0;
+      return 0;
+    }
   kstr = mu_str_stripws (inp->buffer);
   val = mu_str_skip_class_comp (kstr, MU_CTYPE_SPACE);
   *val++ = 0;
@@ -424,6 +452,150 @@ ascii_reader (struct iobuf *inp, void *data MU_ARG_UNUSED,
   return 0;
 }  
 
+void
+write_quoted_string (mu_stream_t stream, char *str, size_t len)
+{
+  for (; len; str++, len--)
+    {
+      if (*str == '"')
+       {
+         mu_stream_write (stream, "\\", 1, NULL);
+         mu_stream_write (stream, str, 1, NULL);
+       }
+      else if (*str != '\t' && *str != '\\' && mu_isprint (*str))
+       mu_stream_write (stream, str, 1, NULL);
+      else
+       {
+         int c = mu_wordsplit_c_quote_char (*str);
+
+         mu_stream_write (stream, "\\", 1, NULL);
+         if (c != -1)
+           mu_stream_write (stream, str, 1, NULL);
+         else
+           mu_stream_printf (stream, "%03o", *(unsigned char *) str);
+       }
+    }
+}
+
+static int
+C_writer (struct iobuf *iop, void *data MU_ARG_UNUSED,
+         struct mu_dbm_datum const *key,
+         struct mu_dbm_datum const *content)
+{
+  write_quoted_string (iop->stream, key->mu_dptr, key->mu_dsize);
+  mu_stream_write (iop->stream, "\n", 1, NULL);
+  write_quoted_string (iop->stream, content->mu_dptr, content->mu_dsize);
+  mu_stream_write (iop->stream, "\n\n", 2, NULL);
+  return 0;
+}
+
+#define ISODIGIT(c) ((c) >= '0' && c < '8')
+#define OCTVAL(c) ((c) - '0')
+
+static int
+C_read_datum (struct iobuf *inp, struct mu_dbm_datum *datum)
+{
+  size_t i = 0;
+  char *base, *ptr;
+  size_t length;
+  int rc;
+  
+  free (datum->mu_dptr);
+  memset (datum, 0, sizeof (*datum));
+
+  rc = input_getline (inp);
+  if (rc)
+    {
+      mu_error ("%s", mu_strerror (rc));
+      return -1;
+    }
+  if (input_eof (inp))
+    return 1;
+  if ((length = input_length (inp)) == 0)
+    {
+      mu_error (_("empty line"));
+      return -1;
+    }
+
+  memset (datum, 0, sizeof (*datum));
+  datum->mu_dptr = ptr = xmalloc (length);
+  base = inp->buffer;
+  for (i = 0; i < length; ptr++)
+    {
+      if (base[i] == '\\')
+       {
+         if (++i >= length)
+           {
+             mu_error (_("unfinished string"));
+             return -1;
+           }
+         else if (ISODIGIT (base[i]))
+           {
+             unsigned c;
+
+             if (i + 3 > length)
+               {
+                 mu_error (_("unfinished string"));
+                 return -1;
+               }
+             c = OCTVAL (base[i]);
+             c <<= 3;
+             c |= OCTVAL (base[i + 1]);
+             c <<= 3;
+             c |= OCTVAL (base[i + 2]);
+             *ptr = c;
+             i += 3;
+           }
+         else
+           {
+             int c = mu_wordsplit_c_unquote_char (base[i]);
+             if (c == -1)
+               {
+                 mu_error (_("invalid escape sequence (\\%c)"), base[i]);
+                 return -1;
+               }
+             *ptr = c;
+           }
+       }
+      else
+       *ptr = base[i++];
+    }
+  datum->mu_dsize = ptr - datum->mu_dptr;
+  return 0;
+}
+
+static int
+C_reader (struct iobuf *inp, void *data MU_ARG_UNUSED,
+         struct mu_dbm_datum *key,
+         struct mu_dbm_datum *content)
+{
+  int rc;
+
+  rc = C_read_datum (inp, key);
+  if (rc < 0)
+    exit (EX_DATAERR);
+  else if (rc == 1)
+    return 1;
+  
+  if (C_read_datum (inp, content))
+    exit (EX_DATAERR);
+
+  rc = input_getline (inp);
+  if (rc)
+    {
+      mu_error ("%s", mu_strerror (rc));
+      return -1;
+    }
+
+  if (input_length (inp) != 0)
+    {
+      mu_error (_("unrecognized line"));
+      return -1;
+    }
+
+  return 0;
+}  
+
 static void
 newfmt_init (struct xfer_format *fmt, const char *version,
             struct iobuf *iop, int wr)
@@ -465,15 +637,16 @@ newfmt_read_datum (struct iobuf *iop, mu_opool_t pool,
   unsigned char *ptr, *out;
   size_t len;
 
-  mu_dbm_datum_free (datum);
-  
+  free (datum->mu_dptr);
+  memset (datum, 0, sizeof (*datum));
+         
   rc = input_getline (iop);
   if (rc)
     {
       mu_error ("%s", mu_strerror (rc));
       exit (EX_IOERR);
     }
-  if (iop->length == 0)
+  if (input_eof (iop))
     return 1;
   
   if (!is_len_directive (iop))
@@ -505,7 +678,7 @@ newfmt_read_datum (struct iobuf *iop, mu_opool_t pool,
          mu_error ("%s", mu_strerror (rc));
          exit (EX_IOERR);
        }
-      if (iop->length == 0)
+      if (input_eof (iop))
        break;
       if (is_len_directive (iop))
        {
@@ -524,8 +697,6 @@ newfmt_read_datum (struct iobuf *iop, mu_opool_t pool,
       exit (EX_SOFTWARE);
     }
 
-  mu_dbm_datum_free (datum);
-  
   datum->mu_dptr = (void*) out;
   return 0;
 }
@@ -559,7 +730,7 @@ newfmt_write_datum (struct iobuf *iop, struct mu_dbm_datum 
const *datum)
       exit (EX_SOFTWARE);
     }
   mu_stream_write (iop->stream, iop->buffer, iop->bufsize, NULL);
-  free (iop->buffer); // FIXME
+  free (iop->buffer); /* FIXME */
   mu_stream_write (iop->stream, "\n", 1, NULL);
 }
 
@@ -1220,7 +1391,7 @@ add_records (int mode, int replace)
   input.buffer = NULL;
   input.bufsize = 0;
   input.length = 0;
-  input.read = 0;
+  input.flag = 0;
   input.stream = instream;
 
   /* Read directive header */
diff --git a/pop3d/bulletin.c b/pop3d/bulletin.c
index 5efd777..9f4105d 100644
--- a/pop3d/bulletin.c
+++ b/pop3d/bulletin.c
@@ -133,8 +133,6 @@ read_bulletin_db (size_t *pnum)
       return rc;
     }
 
-  mu_dbm_safety_set_flags (db, DEFAULT_GROUP_DB_SAFETY);
-
   rc = mu_dbm_safety_check (db);
   if (rc)
     {


hooks/post-receive
-- 
GNU Mailutils