if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
continue;
case FILESW:
if (filep > NFOLDERS)
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- files[filep++] = path(cp, TFILE);
+ files[filep++] = getcpy(expanddir(cp));
continue;
case RPROCSW:
if (foldp > NFOLDERS)
adios(NULL, "only %d folders allowed!",
NFOLDERS);
- folders[foldp++].f_name =
- pluspath(cp);
+ folders[foldp++].f_name = getcpy(expandfol(cp));
} else
- app_msgarg(&msgs, cp);
+ app_msgarg(&msgs, cp);
}
if (foldp == 0)
}
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
- folder = getfolder(FCUR);
- strncpy(maildir, m_maildir(folder), sizeof(maildir));
+ folder = getcurfol();
+ strncpy(maildir, toabsdir(folder), sizeof(maildir));
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
** directory. This should be moved to folder_delmsgs().
*/
if (rmmproc) {
- context_replace(pfolder, folder);
+ context_replace(curfolder, folder);
context_save();
fflush(stdout);
}
seq_setcur(mp, mp->hghsel);
seq_save(mp); /* synchronize message sequences */
- context_replace(pfolder, folder); /* update current folder */
+ context_replace(curfolder, folder); /* update current folder */
context_save(); /* save the context file */
folder_free(mp); /* free folder structure */
done(0);
register struct msgs *mp;
for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
- chdir(m_maildir(""));
- strncpy(nmaildir, m_maildir(fp->f_name), sizeof(nmaildir));
+ chdir(toabsdir("+"));
+ strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
create_folder(nmaildir, 0, done);