adios(NULL, "only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- file = path(cp, TFILE);
+ file = getcpy(expanddir(cp));
continue;
case HEADSW:
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else if (mode != SHOW) {
goto usage;
} else {
}
procp = vecp;
- if (!context_find("path"))
- free(path("./", TFOLDER));
-
if (file) {
if (msgp)
adios(NULL, "only one file at a time!");
}
if (!folder)
- folder = getfolder(FCUR);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
- context_replace(pfolder, folder); /* update current folder */
+ context_replace(curfolder, folder); /* update current folder */
context_save(); /* save the context file */
if (headersw && vecp == 2)
if (!strcmp(mhbasename(proc), "mhl")
&& !file
&& chdir(maildir =
- concat(m_maildir(""), "/", NULL)) != NOTOK) {
+ concat(toabsdir("+"), "/", NULL)) != NOTOK) {
mp->foldpath = concat(mp->foldpath, "/", NULL);
cp = isprefix(maildir, mp->foldpath)
? mp->foldpath + strlen(maildir)
int passno;
char c;
- cp = add(buf, NULL);
+ cp = getcpy(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);
** Check Content-Transfer-Encoding field
*/
if (!mh_strcasecmp(name, ENCODING_FIELD)) {
- cp = add(buf, NULL);
+ cp = getcpy(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);