crawl_folders.h: Rename to be alongside implementation.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index a1fcf5d81e0d6583ab435ef609a5f69465a51bbe..347ea17c309744f91aa7e35dc342c844d7948eb8 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -1,39 +1,61 @@
-
-/*
- * sortm.c -- sort messages in a folder by date/time
+/* sortm.c -- sort messages in a folder by date/time

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/utils.h>
-
-static struct swit switches[] = {
-#define DATESW                 0
-     { "datefield field", 0 },
-#define        TEXTSW                 1
-     { "textfield field", 0 },
-#define        NSUBJSW                2
-     { "notextfield", 0 },
-#define SUBJSW                 3
-     { "subject", -3 },                   /* backward-compatibility */
-#define LIMSW                  4
-     { "limit days", 0 },
-#define        NLIMSW                 5
-     { "nolimit", 0 },
-#define VERBSW                 6
-     { "verbose", 0 },
-#define NVERBSW                7
-     { "noverbose", 0 },
-#define VERSIONSW              8
-     { "version", 0 },
-#define HELPSW                 9
-     { "help", 0 },
-     { NULL, 0 }
-};
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/uprf.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/ext_hook.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+
+#define SORTM_SWITCHES \
+    X("datefield field", 0, DATESW) \
+    X("textfield field", 0, TEXTSW) \
+    X("notextfield", 0, NSUBJSW) \
+    X("subject", -3, SUBJSW) /* backward-compatibility */ \
+    X("limit days", 0, LIMSW) \
+    X("nolimit", 0, NLIMSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("all", 0, ALLMSGS) \
+    X("noall", 0, NALLMSGS) \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SORTM);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SORTM, switches);
+#undef X

 
 struct smsg {
     int s_msg;
 
 struct smsg {
     int s_msg;


@@ -44,10 +66,12 @@ struct smsg {
 static struct smsg *smsgs;
 int nmsgs;
 
 static struct smsg *smsgs;
 int nmsgs;
 

-char *subjsort = (char *) 0;    /* sort on subject if != 0 */
+char *subjsort;                 /* sort on subject if != 0 */

 time_t datelimit = 0;
 time_t datelimit = 0;

-int submajor = 0;              /* if true, sort on subject-major */
-int verbose;
+bool submajor;                 /* if true, sort on subject-major */
+bool verbose;
+int allmsgs = 1;
+int check_failed = 0;

 
 /* This keeps compiler happy on calls to qsort */
 typedef int (*qsort_comp) (const void *, const void *);
 
 /* This keeps compiler happy on calls to qsort */
 typedef int (*qsort_comp) (const void *, const void *);


@@ -68,21 +92,15 @@ int
 main (int argc, char **argv)
 {
     int        i, msgnum;
 main (int argc, char **argv)
 {
     int        i, msgnum;

-    unsigned char *cp;
-    char *maildir, *datesw = NULL;
+    char *cp, *maildir, *datesw = NULL;

     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     struct smsg **dlist;
     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     struct smsg **dlist;

+    bool checksw = false;

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -97,7 +115,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW:
                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 
            case HELPSW:
                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -110,64 +128,82 @@ main (int argc, char **argv)
 
            case DATESW:
                if (datesw)
 
            case DATESW:
                if (datesw)

-                   adios (NULL, "only one date field at a time");
+                   die("only one date field at a time");

                if (!(datesw = *argp++) || *datesw == '-')
                if (!(datesw = *argp++) || *datesw == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                continue;
 
            case TEXTSW:
                if (subjsort)
                continue;
 
            case TEXTSW:
                if (subjsort)

-                   adios (NULL, "only one text field at a time");
+                   die("only one text field at a time");

                if (!(subjsort = *argp++) || *subjsort == '-')
                if (!(subjsort = *argp++) || *subjsort == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                continue;
 
            case SUBJSW:
                subjsort = "subject";
                continue;
            case NSUBJSW:
                continue;
 
            case SUBJSW:
                subjsort = "subject";
                continue;
            case NSUBJSW:

-               subjsort = (char *)0;
+               subjsort = NULL;

                continue;
 
            case LIMSW:
                if (!(cp = *argp++) || *cp == '-')
                continue;
 
            case LIMSW:
                if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                while (*cp == '0')
                    cp++;               /* skip any leading zeros */
                if (!*cp) {             /* hit end of string */
                while (*cp == '0')
                    cp++;               /* skip any leading zeros */
                if (!*cp) {             /* hit end of string */

-                   submajor++;         /* sort subject-major */
+                   submajor = true;    /* sort subject-major */

                    continue;
                }
                    continue;
                }

-               if (!isdigit(*cp) || !(datelimit = atoi(cp)))
-                   adios (NULL, "impossible limit %s", cp);
+               if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp)))
+                   die("impossible limit %s", cp);

                datelimit *= 60*60*24;
                continue;
            case NLIMSW:
                datelimit *= 60*60*24;
                continue;
            case NLIMSW:

-               submajor = 0;   /* use date-major, but */
-               datelimit = 0;  /* use no limit */
+               submajor = false;       /* use date-major, but */
+               datelimit = 0;          /* use no limit */

                continue;
 
            case VERBSW:
                continue;
 
            case VERBSW:

-               verbose++;
+               verbose = true;

                continue;
            case NVERBSW:
                continue;
            case NVERBSW:

-               verbose = 0;
+               verbose = false;
+               continue;
+
+           case ALLMSGS:
+               allmsgs = 1;
+               continue;
+           case NALLMSGS:
+               allmsgs = 0;
+               continue;
+
+           case CHECKSW:
+               checksw = true;
+               continue;
+           case NCHECKSW:
+               checksw = false;

                continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else
        } else

-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);

     }
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
     }
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));

-    if (!msgs.size)
-       app_msgarg(&msgs, "all");
+    if (!msgs.size) {
+       if (allmsgs) {
+           app_msgarg(&msgs, "all");
+        } else {
+           die("must specify messages to sort with -noall");
+        }
+    }

     if (!datesw)
        datesw = "date";
     if (!folder)
     if (!datesw)
        datesw = "date";
     if (!folder)


@@ -178,12 +214,12 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */

-    if (!(mp = folder_read (folder)))
-       adios (NULL, "unable to read folder %s", folder);
+    if (!(mp = folder_read (folder, 1)))
+       die("unable to read folder %s", folder);

 
     /* check for empty folder */
     if (mp->nummsg == 0)
 
     /* check for empty folder */
     if (mp->nummsg == 0)

-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);

 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -192,27 +228,32 @@ main (int argc, char **argv)
     seq_setprev (mp);  /* set the previous sequence */
 
     if ((nmsgs = read_hdrs (mp, datesw)) <= 0)
     seq_setprev (mp);  /* set the previous sequence */
 
     if ((nmsgs = read_hdrs (mp, datesw)) <= 0)

-       adios (NULL, "no messages to sort");
+       die("no messages to sort");
+
+    if (checksw  &&  check_failed) {
+       die("errors found, no messages sorted");
+    }

 
     /*
      * sort a list of pointers to our "messages to be sorted".
      */
 
     /*
      * sort a list of pointers to our "messages to be sorted".
      */

-    dlist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*dlist));
+    dlist = mh_xmalloc ((nmsgs+1) * sizeof(*dlist));

     for (i = 0; i < nmsgs; i++)
        dlist[i] = &smsgs[i];
     dlist[nmsgs] = 0;
 
     if (verbose) {     /* announce what we're doing */
        if (subjsort)
     for (i = 0; i < nmsgs; i++)
        dlist[i] = &smsgs[i];
     dlist[nmsgs] = 0;
 
     if (verbose) {     /* announce what we're doing */
        if (subjsort)

-           printf ("sorting by %s-major %s-minor\n",
-               submajor ? subjsort : datesw,
-               submajor ? datesw : subjsort);
+           if (submajor)
+               printf ("sorting by %s\n", subjsort);
+           else
+               printf ("sorting by %s-major %s-minor\n", subjsort, datesw);

        else
            printf ("sorting by datefield %s\n", datesw);
     }
 
     /* first sort by date, or by subject-major, date-minor */
        else
            printf ("sorting by datefield %s\n", datesw);
     }
 
     /* first sort by date, or by subject-major, date-minor */

-    qsort ((char *) dlist, nmsgs, sizeof(*dlist),
+    qsort (dlist, nmsgs, sizeof(*dlist),

            (qsort_comp) (submajor && subjsort ? txtsort : dsort));
 
     /*
            (qsort_comp) (submajor && subjsort ? txtsort : dsort));
 
     /*


@@ -222,30 +263,28 @@ main (int argc, char **argv)
      */
     if (!submajor && subjsort) {       /* already date sorted */
        struct smsg **slist, **flist;
      */
     if (!submajor && subjsort) {       /* already date sorted */
        struct smsg **slist, **flist;

-       register struct smsg ***il, **fp, **dp;
+       struct smsg ***il, **fp, **dp;

 
 

-       slist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*slist));
-       memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
-       qsort((char *)slist, nmsgs, sizeof(*slist), (qsort_comp) subsort);
+       slist = mh_xmalloc ((nmsgs+1) * sizeof(*slist));
+       memcpy(slist, dlist, (nmsgs+1)*sizeof(*slist));
+       qsort(slist, nmsgs, sizeof(*slist), (qsort_comp) subsort);

 
        /*
         * make an inversion list so we can quickly find
         * the collection of messages with the same subj
         * given a message number.
         */
 
        /*
         * make an inversion list so we can quickly find
         * the collection of messages with the same subj
         * given a message number.
         */

-       il = (struct smsg ***) calloc (mp->hghsel+1, sizeof(*il));
-       if (! il)
-           adios (NULL, "couldn't allocate msg list");
+       il = mh_xcalloc(mp->hghsel + 1, sizeof *il);

        for (i = 0; i < nmsgs; i++)
            il[slist[i]->s_msg] = &slist[i];
        /*
         * make up the final list, chronological but with
         * all the same subjects grouped together.
         */
        for (i = 0; i < nmsgs; i++)
            il[slist[i]->s_msg] = &slist[i];
        /*
         * make up the final list, chronological but with
         * all the same subjects grouped together.
         */

-       flist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*flist));
+       flist = mh_xmalloc ((nmsgs+1) * sizeof(*flist));

        fp = flist;
        for (dp = dlist; *dp;) {
        fp = flist;
        for (dp = dlist; *dp;) {

-           register struct smsg **s = il[(*dp++)->s_msg];
+           struct smsg **s = il[(*dp++)->s_msg];

 
            /* see if we already did this guy */
            if (! s)
 
            /* see if we already did this guy */
            if (! s)


@@ -267,6 +306,7 @@ main (int argc, char **argv)
            }
        }
        *fp = 0;
            }
        }
        *fp = 0;

+       free (il);

        free (slist);
        free (dlist);
        dlist = flist;
        free (slist);
        free (dlist);
        dlist = flist;


@@ -291,17 +331,9 @@ static int
 read_hdrs (struct msgs *mp, char *datesw)
 {
     int msgnum;
 read_hdrs (struct msgs *mp, char *datesw)
 {
     int msgnum;

-    struct tws tb;
-    register struct smsg *s;
-
-    twscopy (&tb, dlocaltimenow ());
-
-    smsgs = (struct smsg *)
-       calloc ((size_t) (mp->hghsel - mp->lowsel + 2),
-           sizeof(*smsgs));
-    if (smsgs == NULL)
-       adios (NULL, "unable to allocate sort storage");
+    struct smsg *s;

 
 

+    smsgs = mh_xcalloc(mp->hghsel - mp->lowsel + 2, sizeof *smsgs);

     s = smsgs;
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        if (is_selected(mp, msgnum)) {
     s = smsgs;
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        if (is_selected(mp, msgnum)) {


@@ -312,7 +344,7 @@ read_hdrs (struct msgs *mp, char *datesw)
        }
     }
     s->s_msg = 0;
        }
     }
     s->s_msg = 0;

-    return(s - smsgs);
+    return s - smsgs;

 }
 
 
 }
 
 


@@ -324,68 +356,74 @@ read_hdrs (struct msgs *mp, char *datesw)
 static int
 get_fields (char *datesw, int msg, struct smsg *smsg)
 {
 static int
 get_fields (char *datesw, int msg, struct smsg *smsg)
 {

-    register int state;
+    int state;

     int compnum;
     int compnum;

-    char *msgnam, buf[BUFSIZ], nam[NAMESZ];
-    register struct tws *tw;
-    register char *datecomp = NULL, *subjcomp = NULL;
-    register FILE *in;
+    char *msgnam, buf[NMH_BUFSIZ], nam[NAMESZ];
+    struct tws *tw;
+    char *datecomp = NULL, *subjcomp = NULL;
+    FILE *in;
+    m_getfld_state_t gstate;

 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");

-       return (0);
+       return 0;

     }
     }

-    for (compnum = 1, state = FLD;;) {
-       switch (state = m_getfld (state, nam, buf, sizeof(buf), in)) {
+    gstate = m_getfld_state_init(in);
+    for (compnum = 1;;) {
+       int bufsz = sizeof buf;
+       switch (state = m_getfld2(&gstate, nam, buf, &bufsz)) {

        case FLD:
        case FLD:

-       case FLDEOF:

        case FLDPLUS:
            compnum++;
        case FLDPLUS:
            compnum++;

-           if (!mh_strcasecmp (nam, datesw)) {
+           if (!strcasecmp (nam, datesw)) {

                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {
                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {

-                   state = m_getfld (state, nam, buf, sizeof(buf), in);
+                   bufsz = sizeof buf;
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);

                    datecomp = add (buf, datecomp);
                }
                if (!subjsort || subjcomp)
                    break;
                    datecomp = add (buf, datecomp);
                }
                if (!subjsort || subjcomp)
                    break;

-           } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
+           } else if (subjsort && !strcasecmp (nam, subjsort)) {

                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {

-                   state = m_getfld (state, nam, buf, sizeof(buf), in);
+                   bufsz = sizeof buf;
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);

                    subjcomp = add (buf, subjcomp);
                }
                if (datecomp)
                    break;
            } else {
                /* just flush this guy */
                    subjcomp = add (buf, subjcomp);
                }
                if (datecomp)
                    break;
            } else {
                /* just flush this guy */

-               while (state == FLDPLUS)
-                   state = m_getfld (state, nam, buf, sizeof(buf), in);
+               while (state == FLDPLUS) {
+                   bufsz = sizeof buf;
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);
+               }

            }
            continue;
 
        case BODY:
            }
            continue;
 
        case BODY:

-       case BODYEOF:

        case FILEEOF:
            break;
 
        case LENERR:
        case FMTERR:
        case FILEEOF:
            break;
 
        case LENERR:
        case FMTERR:

-           if (state == LENERR || state == FMTERR)
-               admonish (NULL, "format error in message %d (header #%d)",
+           if (state == LENERR || state == FMTERR) {
+               inform("format error in message %d (header #%d), continuing...",

                      msg, compnum);
                      msg, compnum);

-           if (datecomp)
-               free (datecomp);
-           if (subjcomp)
-               free (subjcomp);
+               check_failed = 1;
+           }
+            free(datecomp);
+            free(subjcomp);

            fclose (in);
            fclose (in);

-           return (0);
+           return 0;

 
        default:
 
        default:

-           adios (NULL, "internal error -- you lose");
+           die("internal error -- you lose");

        }
        break;
     }
        }
        break;
     }

+    m_getfld_state_destroy (&gstate);

 
     /*
      * If no date component, then use the modification
 
     /*
      * If no date component, then use the modification


@@ -394,9 +432,11 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
     if (!datecomp || (tw = dparsetime (datecomp)) == NULL) {
        struct stat st;
 
     if (!datecomp || (tw = dparsetime (datecomp)) == NULL) {
        struct stat st;
 

-       admonish (NULL, "can't parse %s field in message %d", datesw, msg);
+       inform("can't parse %s field in message %d, "
+            "will use file modification time", datesw, msg);

        fstat (fileno (in), &st);
        smsg->s_clock = st.st_mtime;
        fstat (fileno (in), &st);
        smsg->s_clock = st.st_mtime;

+       check_failed = 1;

     } else {
        smsg->s_clock = dmktime (tw);
     }
     } else {
        smsg->s_clock = dmktime (tw);
     }


@@ -408,26 +448,24 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
             * leading "re:", everything but letters & smash
             * letters to lower case.
             */
             * leading "re:", everything but letters & smash
             * letters to lower case.
             */

-           register char  *cp, *cp2;
-           register unsigned char c;
+           char  *cp, *cp2, c;

 
            cp = subjcomp;
            cp2 = subjcomp;
            if (strcmp (subjsort, "subject") == 0) {
                while ((c = *cp)) {
 
            cp = subjcomp;
            cp2 = subjcomp;
            if (strcmp (subjsort, "subject") == 0) {
                while ((c = *cp)) {

-                   if (! isspace(c)) {
-                       if(uprf(cp, "re:"))
-                           cp += 2;
-                       else
+                   if (! isspace((unsigned char) c)) {
+                       if(!uprf(cp, "re:"))

                            break;
                            break;

+                        cp += 2;

                    }
                    cp++;
                }
            }
 
            while ((c = *cp++)) {
                    }
                    cp++;
                }
            }
 
            while ((c = *cp++)) {

-               if (isalnum(c))
-                   *cp2++ = isupper(c) ? tolower(c) : c;
+               if (isascii((unsigned char) c) && isalnum((unsigned char) c))
+                   *cp2++ = tolower((unsigned char)c);

            }
 
            *cp2 = '\0';
            }
 
            *cp2 = '\0';


@@ -438,10 +476,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        smsg->s_subj = subjcomp;
     }
     fclose (in);
        smsg->s_subj = subjcomp;
     }
     fclose (in);

-    if (datecomp)
-       free (datecomp);
+    free(datecomp);

 
 

-    return (1);
+    return 1;

 }
 
 /*
 }
 
 /*


@@ -451,13 +488,12 @@ static int
 dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)
 dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)

-       return (-1);
-    else if ((*a)->s_clock > (*b)->s_clock)
-       return (1);
-    else if ((*a)->s_msg < (*b)->s_msg)
-       return (-1);
-    else
-       return (1);
+       return -1;
+    if ((*a)->s_clock > (*b)->s_clock)
+       return 1;
+    if ((*a)->s_msg < (*b)->s_msg)
+       return -1;
+    return 1;

 }
 
 /*
 }
 
 /*


@@ -466,25 +502,24 @@ dsort (struct smsg **a, struct smsg **b)
 static int
 subsort (struct smsg **a, struct smsg **b)
 {
 static int
 subsort (struct smsg **a, struct smsg **b)
 {

-    register int i;
+    int i;

 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))

-       return (i);
+       return i;

 
 

-    return (dsort (a, b));
+    return dsort(a, b);

 }
 
 static int
 txtsort (struct smsg **a, struct smsg **b)
 {
 }
 
 static int
 txtsort (struct smsg **a, struct smsg **b)
 {

-    register int i;
+    int i;

 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))

-       return (i);
-    else if ((*a)->s_msg < (*b)->s_msg)
-       return (-1);
-    else
-       return (1);
+       return i;
+    if ((*a)->s_msg < (*b)->s_msg)
+       return -1;
+    return 1;

 }
 
 static void
 }
 
 static void


@@ -496,7 +531,7 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg)
 
     for (;;) {
        nxt = mlist[msg] - smsgs;       /* mlist[msg] is a ptr into smsgs */
 
     for (;;) {
        nxt = mlist[msg] - smsgs;       /* mlist[msg] is a ptr into smsgs */

-       mlist[msg] = (struct smsg *)0;
+       mlist[msg] = NULL;

        old = smsgs[nxt].s_msg;
        new = smsgs[msg].s_msg;
        strncpy (oldname, m_name (old), sizeof(oldname));
        old = smsgs[nxt].s_msg;
        new = smsgs[msg].s_msg;
        strncpy (oldname, m_name (old), sizeof(oldname));


@@ -528,7 +563,7 @@ static void
 rename_msgs (struct msgs *mp, struct smsg **mlist)
 {
     int i, j, old, new;
 rename_msgs (struct msgs *mp, struct smsg **mlist)
 {
     int i, j, old, new;

-    seqset_t tmpset;
+    bvector_t tmpset = bvector_create ();

     char f1[BUFSIZ], tmpfil[BUFSIZ];
     char newbuf[PATH_MAX + 1];
     struct smsg *sp;
     char f1[BUFSIZ], tmpfil[BUFSIZ];
     char newbuf[PATH_MAX + 1];
     struct smsg *sp;


@@ -568,12 +603,12 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
        if (rename (f1, tmpfil) == NOTOK)
            adios (tmpfil, "unable to rename %s to ", f1);
 
        if (rename (f1, tmpfil) == NOTOK)
            adios (tmpfil, "unable to rename %s to ", f1);
 

-       get_msg_flags (mp, &tmpset, old);
+       get_msg_flags (mp, tmpset, old);

 
        rename_chain (mp, mlist, j, i);
 
        /*
 
        rename_chain (mp, mlist, j, i);
 
        /*

-        *      Run the external hook to refile the temorary message number
+        *      Run the external hook to refile the temporary message number

         *      to the real place.
         */
 
         *      to the real place.
         */
 


@@ -583,7 +618,9 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
        if (rename (tmpfil, m_name(new)) == NOTOK)
            adios (m_name(new), "unable to rename %s to", tmpfil);
 
        if (rename (tmpfil, m_name(new)) == NOTOK)
            adios (m_name(new), "unable to rename %s to", tmpfil);
 

-       set_msg_flags (mp, &tmpset, new);
+       set_msg_flags (mp, tmpset, new);

        mp->msgflags |= SEQMOD;
     }
        mp->msgflags |= SEQMOD;
     }

+
+    bvector_free (tmpset);

 }
 }