X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=368bce3fb849098d9a297f66d259cccc39b66a0a;hp=1cac19fd822618e49a752e97ed18ebae030845ba;hb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c;hpb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851

diff --git a/uip/inc.c b/uip/inc.c
index 1cac19f..368bce3 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <locale.h>
+#include <sysexits.h>
 
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -106,12 +107,12 @@ static int return_gid;
 #define DROPGROUPPRIVS() \
     if (setegid(getgid()) != 0) { \
         advise ("setegid", "unable to set group to %ld", (long) getgid()); \
-		_exit (-1); \
+		_exit (EX_OSERR); \
     }
 #define GETGROUPPRIVS() \
     if (setegid(return_gid) != 0) { \
         advise ("setegid", "unable to set group to %ld", (long) return_gid); \
-		_exit (-1); \
+		_exit (EX_OSERR); \
     }
 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
@@ -158,7 +159,7 @@ main(int argc, char **argv)
 	char *maildir_copy = NULL;
 
 	if (atexit(inc_done) != 0) {
-		adios(NULL, "atexit failed");
+		adios(EX_OSERR, NULL, "atexit failed");
 	}
 
 /*
@@ -182,22 +183,21 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				/* sysexits.h EX_USAGE */
-				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 AUDSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
+					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
 				audfile = getcpy(expanddir(cp));
 				continue;
 			case NAUDSW:
@@ -227,7 +227,7 @@ main(int argc, char **argv)
 
 			case FILESW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				from = getcpy(expanddir(cp));
 
@@ -248,13 +248,13 @@ main(int argc, char **argv)
 
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case WIDTHSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				width = atoi(cp);
 				continue;
@@ -262,11 +262,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);
 		}
 	}
@@ -292,10 +292,10 @@ main(int argc, char **argv)
 		newmail = concat(mailspool, "/", getusername(), NULL);
 	}
 	if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
-		adios(NULL, "no mail to incorporate");
+		adios(EX_DATAERR, NULL, "no mail to incorporate");
 
 	if ((cp = strdup(newmail)) == NULL)
-		adios(NULL, "error allocating memory to copy newmail");
+		adios(EX_OSERR, NULL, "error allocating memory to copy newmail");
 
 	newmail = cp;
 
@@ -304,16 +304,16 @@ main(int argc, char **argv)
 	maildir = toabsdir(folder);
 
 	if ((maildir_copy = strdup(maildir)) == NULL)
-		adios(maildir, "error allocating memory to copy maildir");
+		adios(EX_OSERR, maildir, "error allocating memory to copy maildir");
 
 	create_folder(maildir, noisy ? 0 : 1, exit);
 
 	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+		adios(EX_OSERR, maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
-		adios(NULL, "unable to read folder %s", folder);
+		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
 	if (access(newmail, W_OK) != NOTOK) {
 		locked++;
@@ -328,12 +328,12 @@ main(int argc, char **argv)
 		in = lkfopen(newmail, "r");
 		DROPGROUPPRIVS();
 		if (in == NULL)
-			adios(NULL, "unable to lock and fopen %s", newmail);
+			adios(EX_IOERR, NULL, "unable to lock and fopen %s", newmail);
 		fstat(fileno(in), &s1);
 	} else {
 		trnflag = 0;
 		if ((in = fopen(newmail, "r")) == NULL)
-			adios(newmail, "unable to read");
+			adios(EX_IOERR, newmail, "unable to read");
 	}
 
 	/* This shouldn't be necessary but it can't hurt. */
@@ -344,7 +344,7 @@ main(int argc, char **argv)
 		if ((i = stat(audfile, &st)) == NOTOK)
 			advise(NULL, "Creating Receive-Audit: %s", audfile);
 		if ((aud = fopen(audfile, "a")) == NULL)
-			adios(audfile, "unable to append to");
+			adios(EX_IOERR, audfile, "unable to append to");
 		else if (i == NOTOK)
 			chmod(audfile, m_gmprot());
 
@@ -444,7 +444,7 @@ main(int argc, char **argv)
 		} else {
 			fclose(in); in = NULL;
 		}
-		adios(NULL, "failed");
+		adios(EX_SOFTWARE, NULL, "failed");
 	}
 
 	if (aud)