X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=05b3e962751da15f6e88c4fd6d848eb490fbae95;hp=36c1eed24da18fcc4ece9557c28fc8dd7fa694d1;hb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;hpb=7e3bc577e84e13a47005a706718bd6ec0e6a0e0a

diff --git a/uip/rmf.c b/uip/rmf.c
index 36c1eed..05b3e96 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -12,9 +12,9 @@ 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 +34,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 */
@@ -48,26 +46,26 @@ 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 == '@') {
@@ -113,7 +111,7 @@ main(int argc, char **argv)
 
 	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);
@@ -134,20 +132,21 @@ rmf(char *folder)
 	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",
-						current, 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;
+	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)
@@ -163,33 +162,24 @@ rmf(char *folder)
 	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 (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);
@@ -240,7 +230,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) {