#define INTRSW 0
{ "interactive", 0 },
#define NINTRSW 1
- { "nointeractive", 0 },
+ { "nointeractive", 2 },
#define VERSIONSW 2
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 3
{ "help", 0 },
{ NULL, 0 }
char *cp, *folder = NULL, newfolder[BUFSIZ];
char buf[BUFSIZ], **argp, **arguments;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
if (rmf(folder) == OK) {
char *cfolder = context_find(curfolder);
- if (cfolder && strcmp(cfolder, newfolder)) {
+ if (cfolder && strcmp(cfolder, newfolder)!=0) {
printf("[+%s now current]\n", newfolder);
/* update current folder */
context_replace(curfolder, newfolder);
static int
rmf(char *folder)
{
- int i, j, others;
+ int i, others;
register char *maildir;
char cur[BUFSIZ];
register struct dirent *dp;
ext_hook("del-hook", maildir, NULL);
- j = strlen(backup_prefix);
while ((dp = readdir(dd))) {
switch (dp->d_name[0]) {
case '.':
continue; /* else fall */
case ',':
-#ifdef MHE
- case '+':
-#endif /* MHE */
-#ifdef UCI
- case '_':
- case '#':
-#endif /* UCI */
break;
default:
if (m_atoi(dp->d_name))
break;
- if (strcmp(dp->d_name, altmsglink) == 0 ||
- strncmp(dp->d_name,
- backup_prefix, j) == 0)
- break;
admonish(NULL, "file \"%s/%s\" not deleted",
folder, dp->d_name);
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
- if (isprefix("atr-", np->n_name) &&
+ if (strncmp(np->n_name, "atr-", alen)==0 &&
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {