X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=e31c6a627076197567c5ca671227096e08098da1;hp=1cac19fd822618e49a752e97ed18ebae030845ba;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2

diff --git a/uip/inc.c b/uip/inc.c
index 1cac19f..e31c6a6 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>
@@ -73,6 +74,8 @@ static struct swit switches[] = {
 	{ NULL, 0 },
 };
 
+char *version=VERSION;
+
 /*
 ** This is an attempt to simplify things by putting all the
 ** privilege ops into macros.
@@ -106,12 +109,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,20 +161,19 @@ main(int argc, char **argv)
 	char *maildir_copy = NULL;
 
 	if (atexit(inc_done) != 0) {
-		adios(NULL, "atexit failed");
+		adios(EX_OSERR, NULL, "atexit failed");
 	}
 
-/*
-** absolutely the first thing we do is save our privileges,
-** and drop them if we can.
-*/
+	/*
+	** absolutely the first thing we do is save our privileges,
+	** and drop them if we can.
+	*/
 	SAVEGROUPPRIVS();
 	TRYDROPGROUPPRIVS();
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
 
-	/* read user profile/context */
 	context_read();
 
 	arguments = getarguments(invo_name, argc, argv, 1);
@@ -182,23 +184,22 @@ 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]);
-				audfile = getcpy(expanddir(cp));
+					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+				audfile = mh_xstrdup(expanddir(cp));
 				continue;
 			case NAUDSW:
 				audfile = NULL;
@@ -226,10 +227,10 @@ main(int argc, char **argv)
 				continue;
 
 			case FILESW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+				if (!(cp = *argp++))
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				from = getcpy(expanddir(cp));
+				from = (strcmp(cp, "-")==0) ? "-" : mh_xstrdup(expanddir(cp));
 
 				/*
 				** If the truncate file is in default state,
@@ -248,13 +249,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 +263,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));
+				folder = mh_xstrdup(expandfol(cp));
 		} else {
-			adios(NULL, "usage: %s [+folder] [switches]",
+			adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
 					invo_name);
 		}
 	}
@@ -275,47 +276,51 @@ main(int argc, char **argv)
 	** NOTE: above this point you should use TRYDROPGROUPPRIVS(),
 	** not DROPGROUPPRIVS().
 	*/
-	/* guarantee dropping group priveleges; we might not have done so earlier */
+	/* guarantee dropping group privileges; we might not have done so earlier */
 	DROPGROUPPRIVS();
 
-	/*
-	** We will get the mail from a file
-	** (typically the standard maildrop)
-	*/
-	if (from)
-		newmail = from;
-	else if ((newmail = getenv("MAILDROP")) && *newmail)
-		newmail = toabsdir(newmail);
-	else if ((newmail = context_find("maildrop")) && *newmail)
-		newmail = toabsdir(newmail);
-	else {
-		newmail = concat(mailspool, "/", getusername(), NULL);
-	}
-	if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
-		adios(NULL, "no mail to incorporate");
+	if (from && strcmp(from, "-")==0) {
+		/* We'll read mail from stdin. */
+		newmail = NULL;
+	} else {
+		/* We'll read mail from a file. */
+		if (from)
+			newmail = from;
+		else if ((newmail = getenv("MAILDROP")) && *newmail)
+			newmail = toabsdir(newmail);
+		else if ((newmail = context_find("maildrop")) && *newmail)
+			newmail = toabsdir(newmail);
+		else {
+			newmail = concat(mailspool, "/", getusername(), NULL);
+		}
+		if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
+			adios(EX_DATAERR, NULL, "no mail to incorporate");
 
-	if ((cp = strdup(newmail)) == NULL)
-		adios(NULL, "error allocating memory to copy newmail");
+		if ((cp = strdup(newmail)) == NULL)
+			adios(EX_OSERR, NULL, "error allocating memory to copy newmail");
 
-	newmail = cp;
+		newmail = cp;
+	}
 
 	if (!folder)
 		folder = getdeffol();
 	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) {
+	if (!newmail) {
+		trnflag = 0;
+		in = stdin;
+	} else if (access(newmail, W_OK) != NOTOK) {
 		locked++;
 		if (trnflag) {
 			SIGNAL(SIGHUP, SIG_IGN);
@@ -328,12 +333,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 +349,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());
 
@@ -352,18 +357,33 @@ main(int argc, char **argv)
 			 dtimenow(), from);
 	}
 
-	/* Get new format string */
-	fmtstr = new_fs(form, FORMAT);
+	/* Set format string */
+	fmtstr = new_fs(form, scanformat);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
 		fflush(stdout);
 	}
 
+	/* check if readable and nonempty */
+	if (!fgets(buf, sizeof(buf), in)) {
+		if (ferror(in)) {
+			advise("read", "unable to");
+			incerr = SCNFAT;
+		} else {
+			incerr = SCNEOF;
+		}
+		goto giveup;
+	}
+	if (strncmp("From ", buf, 5)!=0) {
+		advise(NULL, "not in mbox format");
+		incerr = SCNFAT;
+		goto giveup;
+	}
+
 	/*
 	** Get the mail from file (usually mail spool)
 	*/
-	thisisanmbox(in);
 	hghnum = msgnum = mp->hghmsg;
 	for (;;) {
 		/*
@@ -431,7 +451,8 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
-	free(maildir_copy);
+giveup:;
+	mh_free0(&maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {
@@ -444,7 +465,7 @@ main(int argc, char **argv)
 		} else {
 			fclose(in); in = NULL;
 		}
-		adios(NULL, "failed");
+		adios(EX_SOFTWARE, NULL, "failed");
 	}
 
 	if (aud)
@@ -466,7 +487,7 @@ main(int argc, char **argv)
 			else
 				admonish(newmail, "error zero'ing");
 		}
-	} else if (noisy) {
+	} else if (noisy && newmail) {
 		printf("%s not zero'd\n", newmail);
 	}
 
@@ -494,9 +515,9 @@ main(int argc, char **argv)
 		fclose(in); in = NULL;
 	}
 
-	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
-	seq_save(mp);  /* synchronize sequences   */
-	context_save();  /* save the context file   */
+	seq_setunseen(mp, 1);
+	seq_save(mp);
+	context_save();
 	return 0;
 }