lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 68132989061c6c40ba3524d8ed35216eaea1b29d..2e2809a2b28547b7598bad7a6fea16fd14d9cbe3 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -10,6 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"

 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \


@@ -44,7 +43,7 @@ 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;
 int submajor = 0;              /* if true, sort on subject-major */
 int verbose;
 time_t datelimit = 0;
 int submajor = 0;              /* if true, sort on subject-major */
 int verbose;


@@ -70,8 +69,7 @@ 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 };
     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };


@@ -79,13 +77,7 @@ main (int argc, char **argv)
     struct smsg **dlist;
     int checksw = 0;
 
     struct smsg **dlist;
     int checksw = 0;
 

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

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


@@ -129,7 +121,7 @@ main (int argc, char **argv)
                subjsort = "subject";
                continue;
            case NSUBJSW:
                subjsort = "subject";
                continue;
            case NSUBJSW:

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

                continue;
 
            case LIMSW:
                continue;
 
            case LIMSW:


@@ -141,7 +133,7 @@ main (int argc, char **argv)
                    submajor++;         /* sort subject-major */
                    continue;
                }
                    submajor++;         /* sort subject-major */
                    continue;
                }

-               if (!isdigit(*cp) || !(datelimit = atoi(cp)))
+               if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp)))

                    adios (NULL, "impossible limit %s", cp);
                datelimit *= 60*60*24;
                continue;
                    adios (NULL, "impossible limit %s", cp);
                datelimit *= 60*60*24;
                continue;


@@ -175,10 +167,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

        } else
        } else

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

     }
 
     if (!context_find ("path"))
     }
 
     if (!context_find ("path"))


@@ -200,7 +191,7 @@ 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)))
+    if (!(mp = folder_read (folder, 1)))

        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -249,7 +240,7 @@ 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));
 
        slist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*slist));
        memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));


@@ -260,9 +251,7 @@ main (int argc, char **argv)
         * the collection of messages with the same subj
         * given a message number.
         */
         * 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];
        /*
        for (i = 0; i < nmsgs; i++)
            il[slist[i]->s_msg] = &slist[i];
        /*


@@ -272,7 +261,7 @@ main (int argc, char **argv)
        flist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*flist));
        fp = flist;
        for (dp = dlist; *dp;) {
        flist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*flist));
        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)


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

+       free (il);

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


@@ -318,17 +308,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)) {


@@ -351,38 +333,39 @@ 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;
-    m_getfld_state_t gstate = 0;
+    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");
        return (0);
     }
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");
        return (0);
     }

+    gstate = m_getfld_state_init(in);

     for (compnum = 1;;) {
        int bufsz = sizeof buf;
     for (compnum = 1;;) {
        int bufsz = sizeof buf;

-       switch (state = m_getfld (&gstate, nam, buf, &bufsz, in)) {
+       switch (state = m_getfld2(&gstate, nam, buf, &bufsz)) {

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

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

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

-                   state = m_getfld (&gstate, nam, buf, &bufsz, in);
+                   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) {
                    bufsz = sizeof buf;
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

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

                    subjcomp = add (buf, subjcomp);
                }
                if (datecomp)
                    subjcomp = add (buf, subjcomp);
                }
                if (datecomp)


@@ -391,7 +374,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                /* just flush this guy */
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                /* just flush this guy */
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

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

                }
            }
            continue;
                }
            }
            continue;


@@ -403,14 +386,12 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        case LENERR:
        case FMTERR:
            if (state == LENERR || state == FMTERR) {
        case LENERR:
        case FMTERR:
            if (state == LENERR || state == FMTERR) {

-               admonish (NULL, "format error in message %d (header #%d)",
+               inform("format error in message %d (header #%d), continuing...",

                      msg, compnum);
                check_failed = 1;
            }
                      msg, compnum);
                check_failed = 1;
            }

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

            fclose (in);
            return (0);
 
            fclose (in);
            return (0);
 


@@ -428,10 +409,8 @@ 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;
 

-       advise (NULL,
-               "can't parse %s field in message %d, "
-               "will use file modification time",
-               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;
        check_failed = 1;
        fstat (fileno (in), &st);
        smsg->s_clock = st.st_mtime;
        check_failed = 1;


@@ -446,26 +425,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';


@@ -476,8 +453,7 @@ 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);
 }


@@ -490,12 +466,11 @@ dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)
        return (-1);
 {
     if ((*a)->s_clock < (*b)->s_clock)
        return (-1);

-    else if ((*a)->s_clock > (*b)->s_clock)
+    if ((*a)->s_clock > (*b)->s_clock)

        return (1);
        return (1);

-    else if ((*a)->s_msg < (*b)->s_msg)
+    if ((*a)->s_msg < (*b)->s_msg)

        return (-1);
        return (-1);

-    else
-       return (1);
+    return (1);

 }
 
 /*
 }
 
 /*


@@ -504,7 +479,7 @@ 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)))
        return (i);
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
        return (i);


@@ -515,14 +490,13 @@ subsort (struct smsg **a, struct smsg **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)))
        return (i);
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
        return (i);

-    else if ((*a)->s_msg < (*b)->s_msg)
+    if ((*a)->s_msg < (*b)->s_msg)

        return (-1);
        return (-1);

-    else
-       return (1);
+    return (1);

 }
 
 static void
 }
 
 static void


@@ -534,7 +508,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));


@@ -566,7 +540,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;


@@ -606,12 +580,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.
         */
 


@@ -621,7 +595,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);

 }
 }