X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=f2460042503dc320953400f8cca287447f7525fd;hb=0b4cb45a0dd18d07f6af9d77283ee369bd17b14e;hp=164ec77b48f979124a14ec00fd96621af6f061be;hpb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index 164ec77..f246004 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,10 @@
 */
 
 #include <h/mh.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define INTRSW  0
@@ -48,17 +52,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;
@@ -70,11 +74,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);
 		}
 	}
@@ -84,7 +88,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;
@@ -105,7 +109,7 @@ main(int argc, char **argv)
 	if (interactive) {
 		cp = concat("Remove folder \"", folder, "\"? ", NULL);
 		if (!getanswer(cp))
-			exit(0);
+			exit(EX_OK);
 		free(cp);
 	}
 
@@ -149,7 +153,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;
 
 	/*