projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetic change
[mmh]
/
uip
/
flist.c
diff --git
a/uip/flist.c
b/uip/flist.c
index
0f44555
..
aef291a
100644
(file)
--- a/
uip/flist.c
+++ b/
uip/flist.c
@@
-128,7
+128,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();
@@
-229,18
+229,14
@@
main(int argc, char **argv)
foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
}
if (*cp == '+' || *cp == '@') {
foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
}
if (*cp == '+' || *cp == '@') {
- foldersToDo[numfolders++] =
- pluspath(cp);
+ foldersToDo[numfolders++] = pluspath(cp);
} else
foldersToDo[numfolders++] = cp;
}
}
} else
foldersToDo[numfolders++] = cp;
}
}
- if (!context_find("path"))
- free(path("./", TFOLDER));
-
/* get current folder */
/* get current folder */
- strncpy(curfolder, getfolder(1), sizeof(curfolder));
+ strncpy(curfolder, getfolder(FCUR), sizeof(curfolder));
/* get nmh base directory */
nmhdir = m_maildir("");
/* get nmh base directory */
nmhdir = m_maildir("");
@@
-691,7
+687,7
@@
do_readonly_folders(void)
atrlen = strlen(atrcur);
for (np = m_defs; np; np = np->n_next)
atrlen = strlen(atrcur);
for (np = m_defs; np; np = np->n_next)
- if (ssequal(atrcur, np->n_name)
- && !ssequal(nmhdir, np->n_name + atrlen))
+ if (isprefix(atrcur, np->n_name)
+ && !isprefix(nmhdir, np->n_name + atrlen))
BuildFolderList(np->n_name + atrlen, 0);
}
BuildFolderList(np->n_name + atrlen, 0);
}