X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=b9c1969b9adb9b9693d6e1f50e7e0705c62a8b05;hp=fb951ed08e1536bb7f51ee1f89381a7146ad249b;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=71932c5d0b008eb518d53f9a53978afd35a70ef5 diff --git a/uip/rmf.c b/uip/rmf.c index fb951ed..b9c1969 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -1,254 +1,256 @@ - /* - * 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. - */ +** rmf.c -- remove a folder +** +** 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 static struct swit switches[] = { -#define INTRSW 0 - { "interactive", 0 }, -#define NINTRSW 1 - { "nointeractive", 0 }, -#define VERSIONSW 2 - { "version", 0 }, -#define HELPSW 3 - { "help", 0 }, - { NULL, 0 } +#define INTRSW 0 + { "interactive", 0 }, +#define NINTRSW 1 + { "nointeractive", 0 }, +#define VERSIONSW 2 + { "Version", 0 }, +#define HELPSW 3 + { "help", 0 }, + { NULL, 0 } }; /* - * static prototypes - */ +** static prototypes +*/ static int rmf(char *); -static void rma (char *); +static void rma(char *); int -main (int argc, char **argv) +main(int argc, char **argv) { - int defolder = 0, interactive = -1; - char *cp, *folder = NULL, newfolder[BUFSIZ]; - char buf[BUFSIZ], **argp, **arguments; + int defolder = 0, interactive = -1; + char *cp, *folder = NULL, newfolder[BUFSIZ]; + char buf[BUFSIZ], **argp, **arguments; #ifdef LOCALE - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); #endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); - - arguments = getarguments (invo_name, argc, argv, 1); - argp = arguments; - - 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; - } + invo_name = mhbasename(argv[0]); + + /* read user profile/context */ + context_read(); + + arguments = getarguments(invo_name, argc, argv, 1); + argp = arguments; + + 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; + } + } + if (*cp == '+' || *cp == '@') { + if (folder) + adios(NULL, "only one folder at a time!"); + else + folder = getcpy(expandfol(cp)); + } else { + adios(NULL, "usage: %s [+folder] [switches]", + invo_name); + } + } + + if (!folder) { + folder = getcurfol(); + defolder++; } - if (*cp == '+' || *cp == '@') { - if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); + if (strcmp(toabsdir(folder), pwd()) == 0) + adios(NULL, "You can't remove the current working directory"); + + if (interactive == -1) + interactive = defolder; + + if (strchr(folder, '/') && (*folder != '/') && (*folder != '.')) { + strcpy(newfolder, folder); + cp = newfolder + strlen(newfolder); + while (cp > newfolder && *cp != '/') + cp--; + if (cp > newfolder) + *cp = '\0'; + else + strncpy(newfolder, getdeffol(), sizeof(newfolder)); } else { - adios (NULL, "usage: %s [+folder] [switches]", invo_name); + strncpy(newfolder, getdeffol(), sizeof(newfolder)); } - } - - if (!context_find ("path")) - free (path ("./", TFOLDER)); - if (!folder) { - folder = getfolder (1); - defolder++; - } - if (strcmp (m_mailpath (folder), pwd ()) == 0) - adios (NULL, "sorry, you can't remove the current working directory"); - - if (interactive == -1) - interactive = defolder; - - if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) { - for (cp = copy (folder, newfolder); cp > newfolder && *cp != '/'; cp--) - continue; - if (cp > newfolder) - *cp = '\0'; - else - strncpy (newfolder, getfolder(0), sizeof(newfolder)); - } else { - strncpy (newfolder, getfolder(0), sizeof(newfolder)); - } - - if (interactive) { - cp = concat ("Remove folder \"", folder, "\"? ", NULL); - if (!getanswer (cp)) - done (0); - free (cp); - } - - 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 */ + + if (interactive) { + cp = concat("Remove folder \"", folder, "\"? ", NULL); + if (!getanswer(cp)) + done(0); + free(cp); + } + + if (rmf(folder) == OK) { + char *cfolder = context_find(curfolder); + 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 */ - return done (0); + context_save(); /* save the context file */ + done(0); + return 1; } static int -rmf (char *folder) +rmf(char *folder) { - int i, j, others; - register char *maildir; - char cur[BUFSIZ]; - register struct dirent *dp; - register DIR *dd; - - switch (i = chdir (maildir = m_maildir (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, m_mailpath (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); - others = 0; - - /* - * Run the external delete hook program. - */ - - (void)ext_hook("del-hook", maildir, (char *)0); - - 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 */ - break; - - default: - if (m_atoi (dp->d_name)) - break; - if (strcmp (dp->d_name, LINK) == 0 - || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0) - break; - - admonish (NULL, "file \"%s/%s\" not deleted", - folder, dp->d_name); - others++; - continue; + int i, j, others; + register char *maildir; + char cur[BUFSIZ]; + register struct dirent *dp; + register 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", 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 (unlink (dp->d_name) == NOTOK) { - admonish (dp->d_name, "unable to unlink %s:", folder); - others++; - } - } - - closedir (dd); - /* - * Remove any relevant private sequences - * or attributes from context file. - */ - rma (folder); + if ((dd = opendir(".")) == NULL) + adios(NULL, "unable to read folder +%s", folder); + others = 0; + + /* + ** Run the external delete hook program. + */ + + 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 ',': + 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; + } + if (unlink(dp->d_name) == NOTOK) { + admonish(dp->d_name, "unable to unlink %s:", folder); + others++; + } + } - chdir (".."); - if (others == 0 && remdir (maildir)) - return OK; + closedir(dd); + + /* + ** Remove any relevant private sequences + ** or attributes from context file. + */ + rma(folder); + + chdir(".."); + if (others == 0) { + context_save(); /* Is this needed? meillo 2011-10 */ + fflush(stdout); /* Is this needed? meillo 2011-10 */ + if (rmdir(maildir) != -1) { + return OK; + } + admonish(maildir, "unable to remove directory"); + } - advise (NULL, "folder +%s not removed", folder); - return NOTOK; + advise(NULL, "folder +%s not removed", folder); + return NOTOK; } /* - * Remove all the (private) sequence information for - * this folder from the profile/context list. - */ +** Remove all the (private) sequence information for +** this folder from the profile/context list. +*/ static void -rma (char *folder) +rma(char *folder) { - register int alen, j, plen; - register char *cp; - register struct node *np, *pp; - - alen = strlen ("atr-"); - plen = strlen (cp = m_mailpath (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 (ssequal ("atr-", np->n_name) - && (j = strlen (np->n_name) - plen) > alen - && *(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); - if (pp) { - pp->n_next = np->n_next; - np = pp; - } else { - m_defs = np->n_next; - } - ctxflags |= CTXMOD; - } else { - pp = np; + register int alen, j, plen; + register char *cp; + register struct node *np, *pp; + + alen = strlen("atr-"); + plen = strlen(cp = getcpy(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 (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) { + if (!np->n_context) + admonish(NULL, "bug: context_del(key=\"%s\")", + np->n_name); + if (pp) { + pp->n_next = np->n_next; + np = pp; + } else { + m_defs = np->n_next; + } + ctxflags |= CTXMOD; + } else { + pp = np; + } } - } + free(cp); }