Simplified m_strn() per Ralph's suggestions.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 0b8e18534188e3a02932cfefc8cec1b3f2471307..dc62f5638fbe2cc94e566e8413d493ba6987d2cf 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) \


@@ -122,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:


@@ -242,7 +241,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));


@@ -253,9 +252,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 ***) mh_xcalloc (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];
        /*


@@ -265,7 +262,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)


@@ -312,17 +309,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 *)
-       mh_xcalloc ((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)) {


@@ -345,12 +334,12 @@ 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 = 0;
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
     m_getfld_state_t gstate = 0;
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {


@@ -397,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);
+            mh_xfree(datecomp);
+            mh_xfree(subjcomp);

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


@@ -422,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;


@@ -440,17 +425,16 @@ 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, c;
+           char  *cp, *cp2, c;

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

-                       if(uprf(cp, "re:"))
-                           cp += 2;
-                       else
+                       if(!uprf(cp, "re:"))

                            break;
                            break;

+                        cp += 2;

                    }
                    cp++;
                }
                    }
                    cp++;
                }


@@ -458,8 +442,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 
            while ((c = *cp++)) {
                if (isascii((unsigned char) c) && isalnum((unsigned char) c))
 
            while ((c = *cp++)) {
                if (isascii((unsigned char) c) && isalnum((unsigned char) c))

-                   *cp2++ = isupper((unsigned char) c) ?
-                                       tolower((unsigned char) c) : c;
+                   *cp2++ = tolower((unsigned char)c);

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


@@ -470,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);
+    mh_xfree(datecomp);

 
     return (1);
 }
 
     return (1);
 }


@@ -484,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);

 }
 
 /*
 }
 
 /*


@@ -498,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);


@@ -509,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


@@ -528,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));


@@ -560,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;

-    bvector_t tmpset = bvector_create (0);
+    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;


@@ -605,7 +585,7 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
        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.
         */