-
-/*
- * rmf.c -- remove a folder
+/* 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 <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_yes_or_no_if_tty.h"
+#include "sbr/concat.h"
+#include "sbr/smatch.h"
+#include "sbr/remdir.h"
+#include "sbr/ssequal.h"
+#include "sbr/m_atoi.h"
+#include "sbr/getfolder.h"
+#include "sbr/ext_hook.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_del.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
#define RMF_SWITCHES \
X("interactive", 0, INTRSW) \
int
main (int argc, char **argv)
{
- int defolder = 0, interactive = -1;
+ bool defolder = false;
+ int interactive = -1;
char *cp, *folder = NULL, newfolder[BUFSIZ];
char buf[BUFSIZ], **argp, **arguments;
+ char *fp;
- setlocale(LC_ALL, "");
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], true, true)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ die("-%s unknown", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios (NULL, "only one folder at a time!");
- else
- folder = pluspath (cp);
+ die("only one folder at a time!");
+ folder = pluspath (cp);
} else {
- adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+ die("usage: %s [+folder] [switches]", invo_name);
}
}
free (path ("./", TFOLDER));
if (!folder) {
folder = getfolder (1);
- defolder++;
+ defolder = true;
}
- if (strcmp (m_mailpath (folder), pwd ()) == 0)
- adios (NULL, "sorry, you can't remove the current working directory");
+ fp = m_mailpath(folder);
+ if (!strcmp(fp, pwd()))
+ die("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';
if (interactive) {
cp = concat ("Remove folder \"", folder, "\"? ", NULL);
- if (!getanswer (cp))
+ if (!read_yes_or_no_if_tty (cp))
done (0);
free (cp);
}
static int
rmf (char *folder)
{
- int i, j, others;
- register char *maildir;
+ int i;
+ bool 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;
}
if ((dd = opendir (".")) == NULL)
- adios (NULL, "unable to read folder +%s", folder);
- others = 0;
+ die("unable to read folder +%s", folder);
+ others = false;
/*
* Run the external delete hook program.
*/
- (void)ext_hook("del-hook", maildir, (char *)0);
+ (void)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 */
+ continue;
+ break;
case ',':
break;
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++;
+ others = true;
continue;
}
- if (unlink (dp->d_name) == NOTOK) {
+ if (m_unlink (dp->d_name) == NOTOK) {
admonish (dp->d_name, "unable to unlink %s:", folder);
- others++;
+ others = true;
}
}
*/
rma (folder);
- chdir ("..");
- if (others == 0 && remdir (maildir))
+ if (chdir ("..") < 0) {
+ advise ("..", "chdir");
+ }
+ if (!others && remdir (maildir))
return OK;
- advise (NULL, "folder +%s not removed", folder);
+ inform("folder +%s not removed", folder);
return NOTOK;
}
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-");
+ alen = LEN("atr-");
plen = strlen (cp = m_mailpath (folder)) + 1;
/*
&& *(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;
pp = np;
}
}
+
+ free(cp);
}
projects / nmh / blobdiff