X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=b9c1969b9adb9b9693d6e1f50e7e0705c62a8b05;hp=fff4abb72aea33b27fcc4d581d0968cc8d78f46b;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=c20b4fa14515c7ab388ce35411d89a7a92300711 diff --git a/uip/rmf.c b/uip/rmf.c index fff4abb..b9c1969 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -14,7 +14,7 @@ static struct swit switches[] = { #define NINTRSW 1 { "nointeractive", 0 }, #define VERSIONSW 2 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 3 { "help", 0 }, { NULL, 0 } @@ -37,7 +37,7 @@ main(int argc, char **argv) #ifdef LOCALE setlocale(LC_ALL, ""); #endif - invo_name = r1bindex(argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); @@ -48,61 +48,60 @@ main(int argc, char **argv) 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); + 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 = pluspath(cp); + folder = getcpy(expandfol(cp)); } else { adios(NULL, "usage: %s [+folder] [switches]", invo_name); } } - if (!context_find("path")) - free(path("./", TFOLDER)); if (!folder) { - folder = getfolder(1); + folder = getcurfol(); defolder++; } - if (strcmp(m_mailpath(folder), pwd()) == 0) - adios(NULL, "sorry, you can't remove the current working directory"); + 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 != '.')) { - for (cp = copy(folder, newfolder); - cp > newfolder && *cp != '/'; cp--) - continue; + strcpy(newfolder, folder); + cp = newfolder + strlen(newfolder); + while (cp > newfolder && *cp != '/') + cp--; if (cp > newfolder) *cp = '\0'; else - strncpy(newfolder, getfolder(0), sizeof(newfolder)); + strncpy(newfolder, getdeffol(), sizeof(newfolder)); } else { - strncpy(newfolder, getfolder(0), sizeof(newfolder)); + strncpy(newfolder, getdeffol(), sizeof(newfolder)); } if (interactive) { @@ -113,11 +112,11 @@ main(int argc, char **argv) } if (rmf(folder) == OK) { - char *cfolder = context_find(pfolder); - if (cfolder && strcmp(cfolder, newfolder)) { + char *cfolder = context_find(curfolder); + if (cfolder && strcmp(cfolder, newfolder)!=0) { printf("[+%s now current]\n", newfolder); /* update current folder */ - context_replace(pfolder, newfolder); + context_replace(curfolder, newfolder); } } context_save(); /* save the context file */ @@ -134,21 +133,22 @@ rmf(char *folder) 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; + 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 ((dd = opendir(".")) == NULL) @@ -159,38 +159,31 @@ rmf(char *folder) ** 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; + if (strcmp(dp->d_name, altmsglink) == 0 || + strncmp(dp->d_name, + backup_prefix, j) == 0) 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); @@ -234,14 +227,14 @@ rma(char *folder) register struct node *np, *pp; alen = strlen("atr-"); - plen = strlen(cp = m_mailpath(folder)) + 1; + 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 (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) { @@ -259,4 +252,5 @@ rma(char *folder) pp = np; } } + free(cp); }