*/
#include <h/mh.h>
+#include <h/utils.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#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 *version=VERSION;
+
/*
** static prototypes
*/
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 */
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
- case AMBIGSW:
- ambigsw(cp, switches);
- done(1);
- case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
-
- case HELPSW:
- snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
- print_help(buf, switches, 1);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
-
- case INTRSW:
- interactive = 1;
- continue;
- case NINTRSW:
- interactive = 0;
- continue;
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ exit(EX_USAGE);
+ case UNKWNSW:
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
+ print_help(buf, switches, 1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
+ case VERSIONSW:
+ print_version(invo_name);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
+
+ case INTRSW:
+ interactive = 1;
+ continue;
+ case NINTRSW:
+ interactive = 0;
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios(NULL, "only one folder at a time!");
+ adios(EX_USAGE, NULL, "only one folder at a time!");
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else {
- adios(NULL, "usage: %s [+folder] [switches]",
+ adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
invo_name);
}
}
defolder++;
}
if (strcmp(toabsdir(folder), pwd()) == 0)
- adios(NULL, "You can't remove the current working directory");
+ adios(EX_USAGE, NULL, "You can't remove the current working directory");
if (interactive == -1)
interactive = defolder;
if (interactive) {
cp = concat("Remove folder \"", folder, "\"? ", NULL);
if (!getanswer(cp))
- done(0);
- free(cp);
+ exit(EX_OK);
+ mh_free0(&cp);
}
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);
}
}
context_save(); /* save the context file */
- done(0);
- return 1;
+ return 0;
}
static int
rmf(char *folder)
{
- int i, j, others;
- register char *maildir;
+ int i, others;
+ char *maildir;
char cur[BUFSIZ];
- register struct dirent *dp;
- register DIR *dd;
+ struct dirent *dp;
+ DIR *dd;
switch (i = chdir(maildir = toabsdir(folder))) {
- case OK:
- if (access(".", W_OK) != NOTOK &&
- access("..", W_OK) != NOTOK)
- break; /* fall otherwise */
-
- case NOTOK:
- snprintf(cur, sizeof(cur), "atr-%s-%s",
- current, toabsdir(folder));
- if (!context_del(cur)) {
- printf("[+%s de-referenced]\n", folder);
- return OK;
- }
- advise(NULL, "you have no profile entry for the %s folder +%s", i == NOTOK ? "unreadable" : "read-only", folder);
- return NOTOK;
+ case OK:
+ if (access(".", W_OK) != NOTOK && access("..", W_OK) != NOTOK)
+ break; /* fall otherwise */
+
+ case NOTOK:
+ snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+ toabsdir(folder));
+ if (!context_del(cur)) {
+ printf("[+%s de-referenced]\n", folder);
+ return OK;
+ }
+ advise(NULL, "you have no profile entry for the %s folder +%s",
+ i == NOTOK ? "unreadable" : "read-only",
+ folder);
+ return NOTOK;
}
if ((dd = opendir(".")) == NULL)
- adios(NULL, "unable to read folder +%s", folder);
+ adios(EX_IOERR, NULL, "unable to read folder +%s", folder);
others = 0;
/*
** Run the external delete hook program.
*/
- (void)ext_hook("del-hook", maildir, (char *)0);
+ ext_hook("del-hook", maildir, NULL);
- j = strlen(backup_prefix);
while ((dp = readdir(dd))) {
switch (dp->d_name[0]) {
- case '.':
- if (strcmp(dp->d_name, ".") == 0 ||
- strcmp(dp->d_name, "..") == 0)
- continue; /* else fall */
-
- case ',':
-#ifdef MHE
- case '+':
-#endif /* MHE */
-#ifdef UCI
- case '_':
- case '#':
-#endif /* UCI */
+ case '.':
+ if (strcmp(dp->d_name, ".") == 0 ||
+ strcmp(dp->d_name, "..") == 0)
+ continue; /* else fall */
+
+ case ',':
+ break;
+
+ default:
+ if (m_atoi(dp->d_name))
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);
- others++;
- continue;
+ admonish(NULL, "file \"%s/%s\" not deleted",
+ folder, dp->d_name);
+ others++;
+ continue;
}
if (unlink(dp->d_name) == NOTOK) {
admonish(dp->d_name, "unable to unlink %s:", folder);
static void
rma(char *folder)
{
- register int alen, j, plen;
- register char *cp;
- register struct node *np, *pp;
+ int alen, j, plen;
+ char *cp;
+ struct node *np, *pp;
alen = strlen("atr-");
- plen = strlen(cp = getcpy(toabsdir(folder))) + 1;
+ plen = strlen(cp = mh_xstrdup(toabsdir(folder))) + 1;
/*
** Search context list for keys that look like
** "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) {
pp = np;
}
}
- free(cp);
+ mh_free0(&cp);
}
projects / mmh / blobdiff