X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=682f66a5c84d7d23cb2cc9cda544e6c28bea7ad2;hp=17e6d614a9662682a7440320b771fad54cff1f60;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2 diff --git a/uip/refile.c b/uip/refile.c index 17e6d61..682f66a 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -13,6 +13,7 @@ #include #include #include +#include static struct swit switches[] = { #define LINKSW 0 @@ -30,6 +31,8 @@ static struct swit switches[] = { { NULL, 0 } }; +char *version=VERSION; + static char maildir[BUFSIZ]; struct st_fold { @@ -75,17 +78,17 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - exit(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown\n", cp); + adios(EX_USAGE, NULL, "-%s unknown\n", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name); print_help(buf, switches, 1); - exit(0); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - exit(0); + exit(argc == 2 ? EX_OK : EX_USAGE); case LINKSW: linkf++; @@ -96,88 +99,102 @@ main(int argc, char **argv) case SRCSW: if (folder) - adios(NULL, "only one source folder at a time!"); + adios(EX_USAGE, NULL, "only one source folder at a time!"); if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); - folder = getcpy(expandfol(cp)); + folder = mh_xstrdup(expandfol(cp)); continue; case FILESW: if (filep > NFOLDERS) - adios(NULL, "only %d files allowed!", + adios(EX_USAGE, NULL, "only %d files allowed!", NFOLDERS); if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); - files[filep++] = getcpy(expanddir(cp)); + files[filep++] = mh_xstrdup(expanddir(cp)); continue; } } if (*cp == '+' || *cp == '@') { if (foldp > NFOLDERS) - adios(NULL, "only %d folders allowed!", + adios(EX_USAGE, NULL, "only %d folders allowed!", NFOLDERS); - folders[foldp++].f_name = getcpy(expandfol(cp)); + folders[foldp++].f_name = mh_xstrdup(expandfol(cp)); } else app_msgarg(&msgs, cp); } if (foldp == 0) - adios(NULL, "no folder specified"); + adios(EX_USAGE, NULL, "no folder specified"); - /* - ** We are refiling a file to the folders - */ if (filep > 0) { - if (folder || msgs.size) - adios(NULL, "use -file or msgs, not both"); + /* + ** We are refiling one or more files (-file) to the folders + */ + if (msgs.size) { + adios(EX_USAGE, NULL, "use -file or msgs, not both"); + } + if (folder) { + adios(EX_USAGE, NULL, "use -file or -src, not both"); + } opnfolds(folders, foldp); - for (i = 0; i < filep; i++) - if (m_file(files[i], folders, foldp, 0)) - /* sysexits.h EX_IOERR */ - exit(1); + for (i = 0; i < filep; i++) { + if (m_file(files[i], folders, foldp, 0)) { + exit(EX_IOERR); + } + } /* If -nolink, then unlink files */ if (!linkf) { int i; char **files = filevec; - /* just unlink the files */ for (i = 0; i < filep; i++) { - if (unlink(files[i]) == NOTOK) + if (unlink(files[i]) == NOTOK) { admonish(files[i], "unable to unlink"); + } } } - exit(0); + exit(EX_OK); } - if (!msgs.size) + /* + ** We are refiling messages to the folders + */ + if (!msgs.size) { app_msgarg(&msgs, seq_cur); - if (!folder) + } + if (!folder) { folder = getcurfol(); - strncpy(maildir, toabsdir(folder), sizeof(maildir)); + } - if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + strncpy(maildir, toabsdir(folder), sizeof(maildir)); + if (chdir(maildir) == NOTOK) { + adios(EX_OSERR, maildir, "unable to change directory to"); + } /* read source folder and create message structure */ - if (!(mp = folder_read(folder))) - adios(NULL, "unable to read folder %s", folder); + if (!(mp = folder_read(folder))) { + adios(EX_IOERR, NULL, "unable to read folder %s", folder); + } - /* check for empty folder */ - if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + if (mp->nummsg == 0) { + adios(EX_DATAERR, NULL, "no messages in %s", folder); + } /* parse the message range/sequence/name and set SELECTED */ - for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert(mp, msgs.msgs[msgnum])) - /* sysexits.h EX_USAGE */ - exit(1); - seq_setprev(mp); /* set the previous-sequence */ + for (msgnum = 0; msgnum < msgs.size; msgnum++) { + if (!m_convert(mp, msgs.msgs[msgnum])) { + exit(EX_SOFTWARE); + } + } + seq_setprev(mp); /* 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 @@ -185,11 +202,11 @@ main(int argc, char **argv) */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { - cp = getcpy(m_name(msgnum)); - if (m_file(cp, folders, foldp, !linkf)) - /* sysexits.h EX_IOERR */ - exit(1); - free(cp); + cp = mh_xstrdup(m_name(msgnum)); + if (m_file(cp, folders, foldp, !linkf)) { + exit(EX_IOERR); + } + mh_free0(&cp); } } @@ -208,9 +225,8 @@ main(int argc, char **argv) if (linkf) { seq_setcur(mp, mp->hghsel); } - seq_save(mp); /* synchronize message sequences */ + seq_save(mp); - context_replace(curfolder, folder); context_save(); folder_free(mp); return 0; @@ -225,8 +241,8 @@ static void opnfolds(struct st_fold *folders, int nfolders) { char nmaildir[BUFSIZ]; - register struct st_fold *fp, *ep; - register struct msgs *mp; + struct st_fold *fp, *ep; + struct msgs *mp; for (fp = folders, ep = folders + nfolders; fp < ep; fp++) { chdir(toabsdir("+")); @@ -234,10 +250,12 @@ opnfolds(struct st_fold *folders, int nfolders) create_folder(nmaildir, 0, exit); - if (chdir(nmaildir) == NOTOK) - adios(nmaildir, "unable to change directory to"); - if (!(mp = folder_read(fp->f_name))) - adios(NULL, "unable to read folder %s", fp->f_name); + if (chdir(nmaildir) == NOTOK) { + adios(EX_OSERR, nmaildir, "unable to change directory to"); + } + if (!(mp = folder_read(fp->f_name))) { + adios(EX_IOERR, NULL, "unable to read folder %s", fp->f_name); + } mp->curmsg = 0; fp->f_mp = mp; @@ -254,8 +272,8 @@ opnfolds(struct st_fold *folders, int nfolders) static void clsfolds(struct st_fold *folders, int nfolders) { - register struct st_fold *fp, *ep; - register struct msgs *mp; + struct st_fold *fp, *ep; + struct msgs *mp; for (fp = folders, ep = folders + nfolders; fp < ep; fp++) { mp = fp->f_mp; @@ -276,9 +294,10 @@ m_file(char *msgfile, struct st_fold *folders, int nfolders, int refile) struct st_fold *fp, *ep; for (fp = folders, ep = folders + nfolders; fp < ep; fp++) { - if ((msgnum = folder_addmsg(&fp->f_mp, msgfile, 1, 0, - 0, nfolders == 1 && refile, maildir)) == -1) + if ((msgnum = folder_addmsg(&fp->f_mp, msgfile, 1, 0, 0, + nfolders == 1 && refile, maildir)) == -1) { return 1; + } } return 0; }