Fixed MIME parser so it can read binary content.

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index aeb76fc15ad3d24aac68b594abc6243996c1dee0..8b58639a3ea17993fd4048626eb31bc6c1c6723f 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -15,7 +15,7 @@
  * static prototypes
  */
 static int seq_init (struct msgs *, char *, char *);
  * static prototypes
  */
 static int seq_init (struct msgs *, char *, char *);

-static void seq_public (struct msgs *, int);
+static int seq_public (struct msgs *, int, int *);

 static void seq_private (struct msgs *);
 
 
 static void seq_private (struct msgs *);
 
 


@@ -25,9 +25,11 @@ static void seq_private (struct msgs *);
  * or context file (for private sequences).
  */
 
  * or context file (for private sequences).
  */
 

-void
+int

 seq_read (struct msgs *mp, int lockflag)
 {
 seq_read (struct msgs *mp, int lockflag)
 {

+    int failed_to_lock = 0;
+

     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.
     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.


@@ -37,13 +39,17 @@ seq_read (struct msgs *mp, int lockflag)
 
     /* If folder is empty, don't scan for sequence information */
     if (mp->nummsg == 0)
 
     /* If folder is empty, don't scan for sequence information */
     if (mp->nummsg == 0)

-       return;
+       return OK;

 
     /* Initialize the public sequences */
 
     /* Initialize the public sequences */

-    seq_public (mp, lockflag);
+    if (seq_public (mp, lockflag, &failed_to_lock) == NOTOK) {
+       if (failed_to_lock) return NOTOK;
+    }

 
     /* Initialize the private sequences */
     seq_private (mp);
 
     /* Initialize the private sequences */
     seq_private (mp);

+
+    return OK;

 }
 
 
 }
 
 


@@ -51,8 +57,8 @@ seq_read (struct msgs *mp, int lockflag)
  * read folder's sequences file for public sequences
  */
 
  * read folder's sequences file for public sequences
  */
 

-static void
-seq_public (struct msgs *mp, int lockflag)
+static int
+seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)

 {
     int state;
     char *cp, seqfile[PATH_MAX];
 {
     int state;
     char *cp, seqfile[PATH_MAX];


@@ -66,13 +72,14 @@ seq_public (struct msgs *mp, int lockflag)
      * then just return, and do not initialize any public sequences.
      */
     if (mh_seq == NULL || *mh_seq == '\0')
      * then just return, and do not initialize any public sequences.
      */
     if (mh_seq == NULL || *mh_seq == '\0')

-       return;
+       return OK;

 
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
 
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 

-    if ((fp = lkfopendata (seqfile, lockflag ? "r+" : "r")) == NULL)
-       return;
+    if ((fp = lkfopendata (seqfile, lockflag ? "r+" : "r", failed_to_lock))
+       == NULL)
+       return NOTOK;

 
     /* Use m_getfld to scan sequence file */
     for (;;) {
 
     /* Use m_getfld to scan sequence file */
     for (;;) {


@@ -81,16 +88,16 @@ seq_public (struct msgs *mp, int lockflag)
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {

-                   cp = getcpy (field);
+                   cp = mh_xstrdup(field);

                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, fp);
                        cp = add (field, cp);
                    }
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, fp);
                        cp = add (field, cp);
                    }

-                   seq_init (mp, getcpy (name), trimcpy (cp));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (cp));

                    free (cp);
                } else {
                    free (cp);
                } else {

-                   seq_init (mp, getcpy (name), trimcpy (field));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (field));

                }
                continue;
 
                }
                continue;
 


@@ -112,10 +119,12 @@ seq_public (struct msgs *mp, int lockflag)
 
     if (lockflag) {
        mp->seqhandle = fp;
 
     if (lockflag) {
        mp->seqhandle = fp;

-       mp->seqname = getcpy(seqfile);
+       mp->seqname = mh_xstrdup(seqfile);

     } else {
        lkfclosedata (fp, seqfile);
     }
     } else {
        lkfclosedata (fp, seqfile);
     }

+
+    return OK;

 }
 
 
 }
 
 


@@ -133,7 +142,7 @@ seq_private (struct msgs *mp)
     char *cp;
     struct node *np;
 
     char *cp;
     struct node *np;
 

-    alen = strlen ("atr-");
+    alen = LEN("atr-");

     plen = strlen (mp->foldpath) + 1;
 
     for (np = m_defs; np; np = np->n_next) {
     plen = strlen (mp->foldpath) + 1;
 
     for (np = m_defs; np; np = np->n_next) {


@@ -141,7 +150,7 @@ seq_private (struct msgs *mp)
                && (j = strlen (np->n_name) - plen) > alen
                && *(np->n_name + j) == '-'
                && strcmp (mp->foldpath, np->n_name + j + 1) == 0) {
                && (j = strlen (np->n_name) - plen) > alen
                && *(np->n_name + j) == '-'
                && strcmp (mp->foldpath, np->n_name + j + 1) == 0) {

-           cp = getcpy (np->n_name + alen);
+           cp = mh_xstrdup(np->n_name + alen);

            *(cp + j - alen) = '\0';
            if ((i = seq_init (mp, cp, getcpy (np->n_field))) != -1)
                make_seq_private (mp, i);
            *(cp + j - alen) = '\0';
            if ((i = seq_init (mp, cp, getcpy (np->n_field))) != -1)
                make_seq_private (mp, i);


@@ -177,7 +186,7 @@ seq_init (struct msgs *mp, char *name, char *field)
      * Search for this sequence name to see if we've seen
      * it already.  If we've seen this sequence before,
      * then clear the bit for this sequence from all the
      * Search for this sequence name to see if we've seen
      * it already.  If we've seen this sequence before,
      * then clear the bit for this sequence from all the

-     * mesages in this folder.
+     * messages in this folder.

      */
     for (i = 0; i < svector_size (mp->msgattrs); i++) {
        if (!strcmp (svector_at (mp->msgattrs, i), name)) {
      */
     for (i = 0; i < svector_size (mp->msgattrs); i++) {
        if (!strcmp (svector_at (mp->msgattrs, i), name)) {