X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=5888d78b20e9c6c8070442d254280bf4379162a0;hp=3ac2e3f2d6e3de5a0f3fe66021ac65c138abffc8;hb=389877bae1fe1a9f7259b8979f6a930744d90fab;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90 diff --git a/uip/sortm.c b/uip/sortm.c index 3ac2e3f..5888d78 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -3,10 +3,15 @@ * sortm.c -- sort messages in a folder by date/time * * $Id$ + * + * 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 -#include +#include +#include /* * We allocate space for messages (msgs array) @@ -95,8 +100,7 @@ main (int argc, char **argv) */ nummsgs = 0; maxmsgs = MAXMSGS; - if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to allocate storage"); + msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs))); /* * Parse arguments @@ -178,9 +182,8 @@ main (int argc, char **argv) */ if (nummsgs >= maxmsgs) { maxmsgs += MAXMSGS; - if (!(msgs = (char **) realloc (msgs, - (size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to reallocate msgs storage"); + msgs = (char **) mh_xrealloc (msgs, + (size_t) (maxmsgs * sizeof(*msgs))); } msgs[nummsgs++] = cp; } @@ -219,16 +222,14 @@ 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; if (verbose) { /* announce what we're doing */ if (subjsort) - printf ("sorting by %s-major %s-minor\n", + printf ("sorting by %s-major %s-minor\n", submajor ? subjsort : datesw, submajor ? datesw : subjsort); else @@ -236,7 +237,7 @@ main (int argc, char **argv) } /* first sort by date, or by subject-major, date-minor */ - qsort ((char *) dlist, nmsgs, sizeof(*dlist), + qsort ((char *) dlist, nmsgs, sizeof(*dlist), (qsort_comp) (submajor && subjsort ? txtsort : dsort)); /* @@ -248,9 +249,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); @@ -268,9 +267,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]; @@ -288,7 +285,7 @@ main (int argc, char **argv) */ while (*s && (*s)->s_subj[0] && strcmp((*s)->s_subj, s[-1]->s_subj) == 0 && - (datelimit == 0 || + (datelimit == 0 || (*s)->s_clock - s[-1]->s_clock <= datelimit)) { il[(*s)->s_msg] = 0; *fp++ = *s++; @@ -299,6 +296,12 @@ main (int argc, char **argv) free (dlist); dlist = flist; } + + /* + * At this point, dlist is a sorted array of pointers to smsg structures, + * each of which contains a message number. + */ + rename_msgs (mp, dlist); context_replace (pfolder, folder); /* update current folder */ @@ -308,7 +311,7 @@ main (int argc, char **argv) return done (0); } -static int +static int read_hdrs (struct msgs *mp, char *datesw) { int msgnum; @@ -427,30 +430,29 @@ get_fields (char *datesw, int msg, struct smsg *smsg) /* * try to make the subject "canonical": delete * leading "re:", everything but letters & smash - * letters to lower case. + * letters to lower case. */ register char *cp, *cp2, c; cp = subjcomp; cp2 = subjcomp; - if (strcmp (subjsort, "subject") == 0) + if (strcmp (subjsort, "subject") == 0) { while ((c = *cp)) { if (! isspace(c)) { if(uprf(cp, "re:")) cp += 2; - else { - if (isalnum(c)) - *cp2++ = isupper(c) ? tolower(c) : c; + else break; - } } cp++; } + } + while ((c = *cp++)) { if (isalnum(c)) *cp2++ = isupper(c) ? tolower(c) : c; - } + *cp2 = '\0'; } else @@ -468,7 +470,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) /* * sort on dates. */ -static int +static int dsort (struct smsg **a, struct smsg **b) { if ((*a)->s_clock < (*b)->s_clock) @@ -484,7 +486,7 @@ dsort (struct smsg **a, struct smsg **b) /* * sort on subjects. */ -static int +static int subsort (struct smsg **a, struct smsg **b) { register int i; @@ -495,7 +497,7 @@ subsort (struct smsg **a, struct smsg **b) return (dsort (a, b)); } -static int +static int txtsort (struct smsg **a, struct smsg **b) { register int i; @@ -513,6 +515,7 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg) { int nxt, old, new; char *newname, oldname[BUFSIZ]; + char newbuf[MAXPATHLEN + 1]; for (;;) { nxt = mlist[msg] - smsgs; /* mlist[msg] is a ptr into smsgs */ @@ -524,6 +527,10 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg) if (verbose) printf ("message %d becomes message %d\n", old, new); + (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); @@ -531,7 +538,7 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg) if (mp->curmsg == old) seq_setcur (mp, new); - if (nxt == endmsg) + if (nxt == endmsg) break; msg = nxt; @@ -546,12 +553,13 @@ rename_msgs (struct msgs *mp, struct smsg **mlist) int i, j, old, new; seqset_t tmpset; char f1[BUFSIZ], tmpfil[BUFSIZ]; + char newbuf[MAXPATHLEN + 1]; struct smsg *sp; strncpy (tmpfil, m_name (mp->hghmsg + 1), sizeof(tmpfil)); for (i = 0; i < nmsgs; i++) { - if (! (sp = mlist[i])) + if (! (sp = mlist[i])) continue; /* did this one */ j = sp - smsgs; @@ -570,11 +578,31 @@ rename_msgs (struct msgs *mp, struct smsg **mlist) if (verbose) printf ("renaming message chain from %d to %d\n", old, new); + /* + * 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/%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); + + /* + * Run the external hook to refile the temorary message number + * to the real place. + */ + + (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);