/*
** If there is a Content-Disposition header and
** it doesn't have a *filename=, extract it from
- ** the magic contents. The r1bindex call skips
+ ** the magic contents. The mhbasename call skips
** any leading directory components.
*/
if (ct->c_dispo)
- ct->c_dispo = incl_name_value(ct->c_dispo, "filename", r1bindex(extract_name_value("name", ci->ci_magic), '/'));
+ ct->c_dispo = incl_name_value(ct->c_dispo, "filename", mhbasename(extract_name_value("name", ci->ci_magic)));
} else
advise(NULL, "extraneous information in message %s's %s: field\n%*.*s(%s)", ct->c_file, TYPE_FIELD, i, i, "", cp);
}
char *vec[9];
vecp = 0;
- vec[vecp++] = r1bindex(ftp, '/');
+ vec[vecp++] = mhbasename(ftp);
vec[vecp++] = e->eb_site;
vec[vecp++] = user;
vec[vecp++] = pass;
return NOTOK;
vecp = 0;
- vec[vecp++] = r1bindex(mailproc, '/');
+ vec[vecp++] = mhbasename(mailproc);
vec[vecp++] = e->eb_server;
vec[vecp++] = "-subject";
vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";