X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=64ee68c7f2ce4539630a6305986c4cd58bbc0ee2;hp=f214f59a8e12baa3ed46e178e267dede1a742587;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1

diff --git a/uip/rmf.c b/uip/rmf.c
index f214f59..64ee68c 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,14 +7,19 @@
 */
 
 #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 }
@@ -34,9 +39,7 @@ main(int argc, char **argv)
 	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 */
@@ -50,17 +53,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case INTRSW:
 				interactive = 1;
@@ -72,11 +75,11 @@ main(int argc, char **argv)
 		}
 		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));
 		} else {
-			adios(NULL, "usage: %s [+folder] [switches]",
+			adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
 					invo_name);
 		}
 	}
@@ -86,7 +89,7 @@ main(int argc, char **argv)
 		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;
@@ -107,31 +110,30 @@ main(int argc, char **argv)
 	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:
@@ -139,8 +141,8 @@ rmf(char *folder)
 			break;  /* fall otherwise */
 
 	case NOTOK:
-		snprintf(cur, sizeof(cur), "atr-%s-%s",
-					current, toabsdir(folder));
+		snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+				toabsdir(folder));
 		if (!context_del(cur)) {
 			printf("[+%s de-referenced]\n", folder);
 			return OK;
@@ -152,7 +154,7 @@ rmf(char *folder)
 	}
 
 	if ((dd = opendir(".")) == NULL)
-		adios(NULL, "unable to read folder +%s", folder);
+		adios(EX_IOERR, NULL, "unable to read folder +%s", folder);
 	others = 0;
 
 	/*
@@ -161,7 +163,6 @@ rmf(char *folder)
 
 	ext_hook("del-hook", maildir, NULL);
 
-	j = strlen(backup_prefix);
 	while ((dp = readdir(dd))) {
 		switch (dp->d_name[0]) {
 		case '.':
@@ -170,22 +171,11 @@ rmf(char *folder)
 				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, altmsglink) == 0 ||
-					strncmp(dp->d_name,
-					backup_prefix, j) == 0)
-				break;
 
 			admonish(NULL, "file \"%s/%s\" not deleted",
 					folder, dp->d_name);
@@ -229,9 +219,9 @@ 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;
 
 	alen = strlen("atr-");
 	plen = strlen(cp = getcpy(toabsdir(folder))) + 1;
@@ -241,7 +231,7 @@ rma(char *folder)
 	** "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,5 +249,5 @@ rma(char *folder)
 			pp = np;
 		}
 	}
-	free(cp);
+	mh_free0(&cp);
 }