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

diff --git a/uip/rmf.c b/uip/rmf.c
index 615369c..64ee68c 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,9 +7,11 @@
 */
 
 #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
@@ -51,17 +53,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				exit(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);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case INTRSW:
 				interactive = 1;
@@ -73,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);
 		}
 	}
@@ -87,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;
@@ -108,8 +110,8 @@ main(int argc, char **argv)
 	if (interactive) {
 		cp = concat("Remove folder \"", folder, "\"? ", NULL);
 		if (!getanswer(cp))
-			exit(0);
-		free(cp);
+			exit(EX_OK);
+		mh_free0(&cp);
 	}
 
 	if (rmf(folder) == OK) {
@@ -128,10 +130,10 @@ static int
 rmf(char *folder)
 {
 	int i, others;
-	register char *maildir;
+	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:
@@ -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;
 
 	/*
@@ -217,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;
@@ -247,5 +249,5 @@ rma(char *folder)
 			pp = np;
 		}
 	}
-	free(cp);
+	mh_free0(&cp);
 }