X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..c576ad2674c37a1c63f004c71049998f38854c64:/sbr/folder_pack.c diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c index 7a661a53..22c02079 100644 --- a/sbr/folder_pack.c +++ b/sbr/folder_pack.c @@ -1,10 +1,6 @@ - -/* - * folder_pack.c -- pack (renumber) the messages in a folder +/* folder_pack.c -- pack (renumber) the messages in a folder * -- into a contiguous range from 1 to n. * - * $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. @@ -37,12 +33,11 @@ folder_pack (struct msgs **mpp, int verbose) * for all numbers from 1 to current high message. */ if (mp->lowoff > 1) { - if ((mp = folder_realloc (mp, 1, mp->hghmsg))) - *mpp = mp; - else { - advise (NULL, "unable to allocate folder storage"); + if (!(mp = folder_realloc(mp, 1, mp->hghmsg))) { + inform("unable to allocate folder storage"); return -1; } + *mpp = mp; } for (msgnum = mp->lowmsg, hole = 1; msgnum <= mp->hghmsg; msgnum++) { @@ -53,6 +48,16 @@ folder_pack (struct msgs **mpp, int verbose) if (verbose) printf ("message %s becomes %s\n", oldmsg, newmsg); + /* + * Invoke the external refile hook for each message being renamed. + * This is done before the file is renamed so that the old message + * file is around for the hook. + */ + + (void)snprintf(oldmsg, sizeof (oldmsg), "%s/%d", mp->foldpath, msgnum); + (void)snprintf(newmsg, sizeof (newmsg), "%s/%d", mp->foldpath, hole); + ext_hook("ref-hook", oldmsg, newmsg); + /* move the message file */ if (rename (oldmsg, newmsg) == -1) { advise (newmsg, "unable to rename %s to", oldmsg);