projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The existence of the profile entry Path is already enforced by context_read().
[mmh]
/
uip
/
rmf.c
diff --git
a/uip/rmf.c
b/uip/rmf.c
index
38a93ff
..
3b532e0
100644
(file)
--- a/
uip/rmf.c
+++ b/
uip/rmf.c
@@
-37,7
+37,7
@@
main(int argc, char **argv)
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
@@
-81,10
+81,8
@@
main(int argc, char **argv)
}
}
}
}
- if (!context_find("path"))
- free(path("./", TFOLDER));
if (!folder) {
if (!folder) {
- folder = getfolder(1);
+ folder = getfolder(FCUR);
defolder++;
}
if (strcmp(m_mailpath(folder), pwd()) == 0)
defolder++;
}
if (strcmp(m_mailpath(folder), pwd()) == 0)
@@
-100,9
+98,9
@@
main(int argc, char **argv)
if (cp > newfolder)
*cp = '\0';
else
if (cp > newfolder)
*cp = '\0';
else
- strncpy(newfolder, getfolder(0), sizeof(newfolder));
+ strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
} else {
} else {
- strncpy(newfolder, getfolder(0), sizeof(newfolder));
+ strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
}
if (interactive) {
}
if (interactive) {
@@
-241,7
+239,7
@@
rma(char *folder)
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
** "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) {
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {