X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3c9700d8d045f3ff26ce5dd2a174454dafc14822..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/rmf.c diff --git a/uip/rmf.c b/uip/rmf.c index 9b12304b..a99b53cf 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -1,23 +1,28 @@ - -/* - * rmf.c -- remove a folder +/* rmf.c -- remove a folder * - * $Id$ + * This code is Copyright (c) 2002, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ #include +#include +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" + +#define RMF_SWITCHES \ + X("interactive", 0, INTRSW) \ + X("nointeractive", 0, NINTRSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ -static struct swit switches[] = { -#define INTRSW 0 - { "interactive", 0 }, -#define NINTRSW 1 - { "nointeractive", 0 }, -#define VERSIONSW 2 - { "version", 0 }, -#define HELPSW 3 - { "help", 4 }, - { NULL, 0 } -}; +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(RMF); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(RMF, switches); +#undef X /* * static prototypes @@ -32,14 +37,9 @@ main (int argc, char **argv) int defolder = 0, interactive = -1; char *cp, *folder = NULL, newfolder[BUFSIZ]; char buf[BUFSIZ], **argp, **arguments; + char *fp; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); + if (nmh_init(argv[0], 1)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -57,10 +57,10 @@ main (int argc, char **argv) snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case INTRSW: interactive = 1; @@ -73,8 +73,7 @@ main (int argc, char **argv) if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder at a time!"); - else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); + folder = pluspath (cp); } else { adios (NULL, "usage: %s [+folder] [switches]", invo_name); } @@ -86,14 +85,16 @@ main (int argc, char **argv) folder = getfolder (1); defolder++; } - if (strcmp (m_mailpath (folder), pwd ()) == 0) + fp = m_mailpath(folder); + if (!strcmp(fp, pwd())) adios (NULL, "sorry, you can't remove the current working directory"); + free(fp); if (interactive == -1) interactive = defolder; if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) { - for (cp = copy (folder, newfolder); cp > newfolder && *cp != '/'; cp--) + for (cp = stpcpy(newfolder, folder); cp > newfolder && *cp != '/'; cp--) continue; if (cp > newfolder) *cp = '\0'; @@ -105,41 +106,48 @@ main (int argc, char **argv) if (interactive) { cp = concat ("Remove folder \"", folder, "\"? ", NULL); - if (!getanswer (cp)) + if (!read_yes_or_no_if_tty (cp)) done (0); free (cp); } - if (rmf (folder) == OK && strcmp (context_find (pfolder), newfolder)) { - printf ("[+%s now current]\n", newfolder); - context_replace (pfolder, newfolder); /* update current folder */ + if (rmf (folder) == OK) { + char *cfolder = context_find(pfolder); + if (cfolder && strcmp (cfolder, newfolder)) { + printf ("[+%s now current]\n", newfolder); + context_replace (pfolder, newfolder); /* update current folder */ + } } context_save (); /* save the context file */ - return done (0); + done (0); + return 1; } static int rmf (char *folder) { - int i, j, others; - register char *maildir; + int i, others; + char *fp; + char *maildir; char cur[BUFSIZ]; - register struct dirent *dp; - register DIR *dd; + struct dirent *dp; + DIR *dd; switch (i = chdir (maildir = m_maildir (folder))) { case OK: if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK) - break; /* fall otherwise */ + break; + /* FALLTHRU */ case NOTOK: - snprintf (cur, sizeof(cur), "atr-%s-%s", - current, m_mailpath (folder)); + fp = m_mailpath(folder); + snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp); + free(fp); if (!context_del (cur)) { printf ("[+%s de-referenced]\n", folder); return OK; } - advise (NULL, "you have no profile entry for the %s folder +%s", + inform("you have no profile entry for the %s folder +%s", i == NOTOK ? "unreadable" : "read-only", folder); return NOTOK; } @@ -148,37 +156,36 @@ rmf (char *folder) adios (NULL, "unable to read folder +%s", folder); others = 0; - j = strlen(BACKUP_PREFIX); + /* + * Run the external delete hook program. + */ + + (void)ext_hook("del-hook", maildir, NULL); + while ((dp = readdir (dd))) { switch (dp->d_name[0]) { case '.': if (strcmp (dp->d_name, ".") == 0 || strcmp (dp->d_name, "..") == 0) - continue; /* else fall */ + continue; + break; 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, LINK) == 0 - || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0) + || has_prefix(dp->d_name, BACKUP_PREFIX)) break; - admonish (NULL, "file \"%s/%s\" not deleted", + inform("file \"%s/%s\" not deleted, continuing...", folder, dp->d_name); others++; continue; } - if (unlink (dp->d_name) == NOTOK) { + if (m_unlink (dp->d_name) == NOTOK) { admonish (dp->d_name, "unable to unlink %s:", folder); others++; } @@ -192,11 +199,13 @@ rmf (char *folder) */ rma (folder); - chdir (".."); + if (chdir ("..") < 0) { + advise ("..", "chdir"); + } if (others == 0 && remdir (maildir)) return OK; - advise (NULL, "folder +%s not removed", folder); + inform("folder +%s not removed", folder); return NOTOK; } @@ -209,15 +218,11 @@ rmf (char *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; - /* sanity check - check that context has been read */ - if (defpath == NULL) - adios (NULL, "oops, context hasn't been read yet"); - - alen = strlen ("atr-"); + alen = LEN("atr-"); plen = strlen (cp = m_mailpath (folder)) + 1; /* @@ -230,7 +235,8 @@ rma (char *folder) && *(np->n_name + j) == '-' && strcmp (cp, np->n_name + j + 1) == 0) { if (!np->n_context) - admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name); + inform("bug: context_del(key=\"%s\"), continuing...", + np->n_name); if (pp) { pp->n_next = np->n_next; np = pp; @@ -242,4 +248,6 @@ rma (char *folder) pp = np; } } + + free(cp); }