X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=7bc6d0b92b221ea7bdf023da0493d6267e6a7f5c;hp=906ea4aa7ba22b857b1df1a27be30d5514a219fe;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822 diff --git a/uip/refile.c b/uip/refile.c index 906ea4a..7bc6d0b 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -4,19 +4,17 @@ * -- into one or more destination folders * * $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 spaces for messages (msgs array) - * this number of elements at a time. - */ -#define MAXMSGS 256 - - static struct swit switches[] = { #define DRAFTSW 0 { "draft", 0 }, @@ -43,12 +41,10 @@ static struct swit switches[] = { #define VERSIONSW 11 { "version", 0 }, #define HELPSW 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; -extern int errno; - static char maildir[BUFSIZ]; struct st_fold { @@ -62,7 +58,7 @@ struct st_fold { static void opnfolds (struct st_fold *, int); static void clsfolds (struct st_fold *, int); static void remove_files (int, char **); -static int m_file (char *, struct st_fold *, int, int); +static int m_file (char *, struct st_fold *, int, int, int); int @@ -70,12 +66,13 @@ main (int argc, char **argv) { int linkf = 0, preserve = 0, filep = 0; int foldp = 0, isdf = 0, unlink_msgs = 0; - int i, msgnum, nummsgs, maxmsgs; + int i, msgnum; char *cp, *folder = NULL, buf[BUFSIZ]; - char **argp, **arguments, **msgs; + char **argp, **arguments; char *filevec[NFOLDERS + 2]; char **files = &filevec[1]; /* leave room for remove_files:vec[0] */ struct st_fold folders[NFOLDERS + 1]; + struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; #ifdef LOCALE @@ -90,15 +87,6 @@ main (int argc, char **argv) argp = arguments; /* - * Allocate the initial space to record message - * names, ranges, and sequences. - */ - nummsgs = 0; - maxmsgs = MAXMSGS; - if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs))))) - adios (NULL, "unable to allocate storage"); - - /* * Parse arguments */ while ((cp = *argp++)) { @@ -175,20 +163,9 @@ main (int argc, char **argv) if (foldp > NFOLDERS) adios (NULL, "only %d folders allowed!", NFOLDERS); folders[foldp++].f_name = - path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); - } else { - /* - * Check if we need to allocate more space - * for message names, ranges, and sequences. - */ - 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; - } + pluspath (cp); + } else + app_msgarg(&msgs, cp); } if (!context_find ("path")) @@ -197,7 +174,7 @@ main (int argc, char **argv) adios (NULL, "no folder specified"); #ifdef WHATNOW - if (!nummsgs && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp) + if (!msgs.size && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp) files[filep++] = cp; #endif /* WHATNOW */ @@ -205,11 +182,11 @@ main (int argc, char **argv) * We are refiling a file to the folders */ if (filep > 0) { - if (folder || nummsgs) + if (folder || msgs.size) adios (NULL, "use -file or some messages, not both"); opnfolds (folders, foldp); for (i = 0; i < filep; i++) - if (m_file (files[i], folders, foldp, preserve)) + if (m_file (files[i], folders, foldp, preserve, 0)) done (1); /* If -nolink, then "remove" files */ if (!linkf) @@ -217,8 +194,8 @@ main (int argc, char **argv) done (0); } - if (!nummsgs) - msgs[nummsgs++] = "cur"; + if (!msgs.size) + app_msgarg(&msgs, "cur"); if (!folder) folder = getfolder (1); strncpy (maildir, m_maildir (folder), sizeof(maildir)); @@ -235,19 +212,24 @@ main (int argc, char **argv) adios (NULL, "no messages in %s", folder); /* parse the message range/sequence/name 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 */ /* create folder structures for each destination folder */ opnfolds (folders, foldp); - /* Link all the selected messages into destination folders */ + /* Link all the selected messages into destination folders. + * + * This causes the add hook to be run for messages that are + * linked into another folder. The refile hook is run for + * messages that are moved to another folder. + */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected (mp, msgnum)) { cp = getcpy (m_name (msgnum)); - if (m_file (cp, folders, foldp, preserve)) + if (m_file (cp, folders, foldp, preserve, !linkf)) done (1); free (cp); } @@ -265,9 +247,13 @@ main (int argc, char **argv) fflush (stdout); } - /* If -nolink, then "remove" messages from source folder */ + /* If -nolink, then "remove" messages from source folder. + * + * Note that folder_delmsgs does not call the delete hook + * because the message has already been handled above. + */ if (!linkf) { - folder_delmsgs (mp, unlink_msgs); + folder_delmsgs (mp, unlink_msgs, 1); } clsfolds (folders, foldp); @@ -280,7 +266,8 @@ main (int argc, char **argv) context_replace (pfolder, folder); /* update current folder */ context_save (); /* save the context file */ folder_free (mp); /* free folder structure */ - return done (0); + done (0); + return 1; } @@ -292,26 +279,15 @@ main (int argc, char **argv) static void opnfolds (struct st_fold *folders, int nfolders) { - register char *cp; char nmaildir[BUFSIZ]; register struct st_fold *fp, *ep; register struct msgs *mp; - struct stat st; for (fp = folders, ep = folders + nfolders; fp < ep; fp++) { chdir (m_maildir ("")); strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir)); - if (stat (nmaildir, &st) == NOTOK) { - if (errno != ENOENT) - adios (nmaildir, "error on folder"); - cp = concat ("Create folder \"", nmaildir, "\"? ", NULL); - if (!getanswer (cp)) - done (1); - free (cp); - if (!makedir (nmaildir)) - adios (NULL, "unable to create folder %s", nmaildir); - } + create_folder (nmaildir, 0, done); if (chdir (nmaildir) == NOTOK) adios (nmaildir, "unable to change directory to"); @@ -383,13 +359,13 @@ remove_files (int filep, char **files) */ static int -m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve) +m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve, int refile) { int msgnum; struct st_fold *fp, *ep; for (fp = folders, ep = folders + nfolders; fp < ep; fp++) { - if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve)) == -1) + if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve, nfolders == 1 && refile, maildir)) == -1) return 1; } return 0;