Started revising m_getfld() code to replace direct buffer

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index cfad3d3c35617dfe0398f3f96f0f5f32a1cfec52..95c76b5f8d2e6eba51d43dd62a4038ea138b8d88 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -28,9 +28,17 @@ static struct swit switches[] = {
      { "verbose", 0 },
 #define NVERBSW                7
      { "noverbose", 0 },
      { "verbose", 0 },
 #define NVERBSW                7
      { "noverbose", 0 },

-#define VERSIONSW              8
+#define ALLMSGS                8
+     { "all", 0 },
+#define NALLMSGS               9
+     { "noall", 0 },
+#define CHECKSW               10
+     { "check", 0 },
+#define NCHECKSW              11
+     { "nocheck", 0 },
+#define VERSIONSW             12

      { "version", 0 },
      { "version", 0 },

-#define HELPSW                 9
+#define HELPSW                13

      { "help", 0 },
      { NULL, 0 }
 };
      { "help", 0 },
      { NULL, 0 }
 };


@@ -45,9 +53,11 @@ static struct smsg *smsgs;
 int nmsgs;
 
 char *subjsort = (char *) 0;    /* sort on subject if != 0 */
 int nmsgs;
 
 char *subjsort = (char *) 0;    /* sort on subject if != 0 */

-unsigned long datelimit = 0;
+time_t datelimit = 0;

 int submajor = 0;              /* if true, sort on subject-major */
 int verbose;
 int submajor = 0;              /* if true, sort on subject-major */
 int 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 *);


@@ -75,6 +85,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     struct smsg **dlist;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     struct smsg **dlist;

+    int checksw = 0;

 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");


@@ -103,10 +114,10 @@ main (int argc, char **argv)
                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);

-               done (1);
+               done (0);

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case DATESW:
                if (datesw)
 
            case DATESW:
                if (datesw)


@@ -153,6 +164,20 @@ main (int argc, char **argv)
            case NVERBSW:
                verbose = 0;
                continue;
            case NVERBSW:
                verbose = 0;
                continue;

+
+           case ALLMSGS:
+               allmsgs = 1;
+               continue;
+           case NALLMSGS:
+               allmsgs = 0;
+               continue;
+
+           case CHECKSW:
+               checksw = 1;
+               continue;
+           case NCHECKSW:
+               checksw = 0;
+               continue;

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


@@ -166,8 +191,13 @@ main (int argc, char **argv)
 
     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 {
+           adios (NULL, "must specify messages to sort with -noall");
+        }
+    }

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


@@ -194,6 +224,10 @@ main (int argc, char **argv)
     if ((nmsgs = read_hdrs (mp, datesw)) <= 0)
        adios (NULL, "no messages to sort");
 
     if ((nmsgs = read_hdrs (mp, datesw)) <= 0)
        adios (NULL, "no messages to sort");
 

+    if (checksw  &&  check_failed) {
+       adios (NULL, "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".
      */


@@ -204,9 +238,10 @@ main (int argc, char **argv)
 
     if (verbose) {     /* announce what we're doing */
        if (subjsort)
 
     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);
     }
        else
            printf ("sorting by datefield %s\n", datesw);
     }


@@ -336,7 +371,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        return (0);
     }
     for (compnum = 1, state = FLD;;) {
        return (0);
     }
     for (compnum = 1, state = FLD;;) {

-       switch (state = m_getfld (state, nam, buf, sizeof(buf), in)) {
+       int bufsz = sizeof buf;
+       switch (state = m_getfld (state, nam, buf, &bufsz, in)) {

        case FLD:
        case FLDEOF:
        case FLDPLUS:
        case FLD:
        case FLDEOF:
        case FLDPLUS:


@@ -344,7 +380,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
            if (!mh_strcasecmp (nam, datesw)) {
                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {
            if (!mh_strcasecmp (nam, datesw)) {
                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {

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

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


@@ -352,15 +389,18 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
            } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {
            } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {

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

                    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_getfld (state, nam, buf, &bufsz, in);
+               }

            }
            continue;
 
            }
            continue;
 


@@ -371,9 +411,11 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 
        case LENERR:
        case FMTERR:
 
        case LENERR:
        case FMTERR:

-           if (state == LENERR || state == FMTERR)
+           if (state == LENERR || state == FMTERR) {

                admonish (NULL, "format error in message %d (header #%d)",
                      msg, compnum);
                admonish (NULL, "format error in message %d (header #%d)",
                      msg, compnum);

+               check_failed = 1;
+           }

            if (datecomp)
                free (datecomp);
            if (subjcomp)
            if (datecomp)
                free (datecomp);
            if (subjcomp)


@@ -397,6 +439,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        admonish (NULL, "can't parse %s field in message %d", datesw, msg);
        fstat (fileno (in), &st);
        smsg->s_clock = st.st_mtime;
        admonish (NULL, "can't parse %s field in message %d", datesw, msg);
        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);
     }


@@ -492,7 +535,7 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg)
 {
     int nxt, old, new;
     char *newname, oldname[BUFSIZ];
 {
     int nxt, old, new;
     char *newname, oldname[BUFSIZ];

-    char newbuf[MAXPATHLEN + 1];
+    char newbuf[PATH_MAX + 1];

 
     for (;;) {
        nxt = mlist[msg] - smsgs;       /* mlist[msg] is a ptr into smsgs */
 
     for (;;) {
        nxt = mlist[msg] - smsgs;       /* mlist[msg] is a ptr into smsgs */


@@ -530,7 +573,7 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
     int i, j, old, new;
     seqset_t tmpset;
     char f1[BUFSIZ], tmpfil[BUFSIZ];
     int i, j, old, new;
     seqset_t tmpset;
     char f1[BUFSIZ], tmpfil[BUFSIZ];

-    char newbuf[MAXPATHLEN + 1];
+    char newbuf[PATH_MAX + 1];

     struct smsg *sp;
 
     strncpy (tmpfil, m_name (mp->hghmsg + 1), sizeof(tmpfil));
     struct smsg *sp;
 
     strncpy (tmpfil, m_name (mp->hghmsg + 1), sizeof(tmpfil));