X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=d483d8686112140957fab5574900f642ba15d122;hp=8f9bf813afdb1d910f5b3d16ca2ae04fbfa85110;hb=0569d6d1631dc90d4f2f2df6bdd0599c7ecc7814;hpb=b465f05ed63a7c310182aa0a32cd29b0e02103a0 diff --git a/uip/sortm.c b/uip/sortm.c index 8f9bf81..d483d86 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -11,13 +11,7 @@ #include #include - -/* - * We allocate space for messages (msgs array) - * this number of elements at a time. - */ -#define MAXMSGS 256 - +#include static struct swit switches[] = { #define DATESW 0 @@ -75,10 +69,11 @@ static void rename_msgs (struct msgs *, struct smsg **); int main (int argc, char **argv) { - int nummsgs, maxmsgs, i, msgnum; + int i, msgnum; char *cp, *maildir, *datesw = NULL; char *folder = NULL, buf[BUFSIZ], **argp; - char **arguments, **msgs; + char **arguments; + struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; struct smsg **dlist; @@ -94,15 +89,6 @@ main (int argc, char **argv) argp = arguments; /* - * Allocate the initial space to record message - * names and ranges. - */ - nummsgs = 0; - maxmsgs = MAXMSGS; - if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to allocate storage"); - - /* * Parse arguments */ while ((cp = *argp++)) { @@ -174,26 +160,15 @@ main (int argc, char **argv) if (folder) adios (NULL, "only one folder at a time!"); else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); - } else { - /* - * Check if we need to allocate more space - * for message names/ranges. - */ - if (nummsgs >= maxmsgs) { - maxmsgs += MAXMSGS; - if (!(msgs = (char **) realloc (msgs, - (size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to reallocate msgs storage"); - } - msgs[nummsgs++] = cp; - } + folder = pluspath (cp); + } else + app_msgarg(&msgs, cp); } if (!context_find ("path")) free (path ("./", TFOLDER)); - if (!nummsgs) - msgs[nummsgs++] = "all"; + if (!msgs.size) + app_msgarg(&msgs, "all"); if (!datesw) datesw = "date"; if (!folder) @@ -212,8 +187,8 @@ main (int argc, char **argv) adios (NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ - for (msgnum = 0; msgnum < nummsgs; msgnum++) - if (!m_convert (mp, msgs[msgnum])) + for (msgnum = 0; msgnum < msgs.size; msgnum++) + if (!m_convert (mp, msgs.msgs[msgnum])) done (1); seq_setprev (mp); /* set the previous sequence */ @@ -223,9 +198,7 @@ main (int argc, char **argv) /* * sort a list of pointers to our "messages to be sorted". */ - dlist = (struct smsg **) malloc ((nmsgs+1) * sizeof(*dlist)); - if (! dlist) - adios (NULL, "couldn't allocate sort memory"); + dlist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*dlist)); for (i = 0; i < nmsgs; i++) dlist[i] = &smsgs[i]; dlist[nmsgs] = 0; @@ -252,9 +225,7 @@ main (int argc, char **argv) struct smsg **slist, **flist; register struct smsg ***il, **fp, **dp; - slist = (struct smsg **) malloc ((nmsgs+1) * sizeof(*slist)); - if (! slist) - adios (NULL, "couldn't allocate sort memory"); + 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); @@ -272,9 +243,7 @@ main (int argc, char **argv) * make up the final list, chronological but with * all the same subjects grouped together. */ - flist = (struct smsg **) malloc ((nmsgs+1) * sizeof(*flist)); - if (! flist) - adios (NULL, "couldn't allocate msg list"); + flist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*flist)); fp = flist; for (dp = dlist; *dp;) { register struct smsg **s = il[(*dp++)->s_msg]; @@ -372,7 +341,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) case FLDEOF: case FLDPLUS: compnum++; - if (!strcasecmp (nam, datesw)) { + if (!mh_strcasecmp (nam, datesw)) { datecomp = add (buf, datecomp); while (state == FLDPLUS) { state = m_getfld (state, nam, buf, sizeof(buf), in); @@ -380,7 +349,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) } if (!subjsort || subjcomp) break; - } else if (subjsort && !strcasecmp (nam, subjsort)) { + } else if (subjsort && !mh_strcasecmp (nam, subjsort)) { subjcomp = add (buf, subjcomp); while (state == FLDPLUS) { state = m_getfld (state, nam, buf, sizeof(buf), in); @@ -534,13 +503,13 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg) if (verbose) printf ("message %d becomes message %d\n", old, new); - if (rename (oldname, newname) == NOTOK) - adios (newname, "unable to rename %s to", oldname); - (void)snprintf(oldname, sizeof (oldname), "%s/%d", mp->foldpath, old); (void)snprintf(newbuf, sizeof (newbuf), "%s/%d", mp->foldpath, new); ext_hook("ref-hook", oldname, newbuf); + if (rename (oldname, newname) == NOTOK) + adios (newname, "unable to rename %s to", oldname); + copy_msg_flags (mp, new, old); if (mp->curmsg == old) seq_setcur (mp, new); @@ -585,24 +554,22 @@ rename_msgs (struct msgs *mp, struct smsg **mlist) if (verbose) printf ("renaming message chain from %d to %d\n", old, new); - if (rename (f1, tmpfil) == NOTOK) - adios (tmpfil, "unable to rename %s to ", f1); - /* - * Run the external hook to refile the old message as message - * number 2147483647. This is our way of making a temporary - * message number. I don't really like this. + * Run the external hook to refile the old message as the + * temporary message number that is off of the end of the + * messages in the folder. */ (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old); - (void)snprintf(newbuf, sizeof (newbuf), "%s/2147483647", mp->foldpath); + (void)snprintf(newbuf, sizeof (newbuf), "%s/%d", mp->foldpath, mp->hghmsg + 1); ext_hook("ref-hook", f1, newbuf); + if (rename (f1, tmpfil) == NOTOK) + adios (tmpfil, "unable to rename %s to ", f1); + get_msg_flags (mp, &tmpset, old); rename_chain (mp, mlist, j, i); - if (rename (tmpfil, m_name(new)) == NOTOK) - adios (m_name(new), "unable to rename %s to", tmpfil); /* * Run the external hook to refile the temorary message number @@ -612,6 +579,9 @@ rename_msgs (struct msgs *mp, struct smsg **mlist) (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new); ext_hook("ref-hook", newbuf, f1); + if (rename (tmpfil, m_name(new)) == NOTOK) + adios (m_name(new), "unable to rename %s to", tmpfil); + set_msg_flags (mp, &tmpset, new); mp->msgflags |= SEQMOD; }