X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffolder_pack.c;h=b0bc67b3b249907c4e1ed1ebfc71bf354ea980a3;hb=464b0345e434044712dffa4d72e72d36316d2b7c;hp=bebc145bdd5c0f46a89b894e4bbe98d3401eecde;hpb=a259594cc41e41bfbb90562d3977b8194d1446f5;p=mmh diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c index bebc145..b0bc67b 100644 --- a/sbr/folder_pack.c +++ b/sbr/folder_pack.c @@ -3,8 +3,6 @@ * 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. @@ -53,20 +51,22 @@ folder_pack (struct msgs **mpp, int verbose) if (verbose) printf ("message %s becomes %s\n", oldmsg, newmsg); - /* move the message file */ - if (rename (oldmsg, newmsg) == -1) { - advise (newmsg, "unable to rename %s to", oldmsg); - return -1; - } - /* * 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); + return -1; + } + /* check if this is the current message */ if (msgnum == mp->curmsg) newcurrent = hole;