#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
if (!context_find("path"))
free(path("./", TFOLDER));
if (!folder) {
- folder = getfolder(1);
+ folder = getfolder(FCUR);
defolder++;
}
if (strcmp(m_mailpath(folder), pwd()) == 0)
if (cp > newfolder)
*cp = '\0';
else
- strncpy(newfolder, getfolder(0), sizeof(newfolder));
+ strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
} else {
- strncpy(newfolder, getfolder(0), sizeof(newfolder));
+ strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
}
if (interactive) {
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
- if (ssequal("atr-", np->n_name) &&
+ if (isprefix("atr-", np->n_name) &&
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {