X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=e31c6a627076197567c5ca671227096e08098da1;hp=f08fb4f3df169a5e94f0acf23c9616b61bdb05f0;hb=1642d62841486ade88ec2c48dd581e3249c98c94;hpb=43ae44731bc0732c894ba6dc7de2d2881c5888e0

diff --git a/uip/inc.c b/uip/inc.c
index f08fb4f..e31c6a6 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -74,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.
@@ -197,7 +199,7 @@ main(int argc, char **argv)
 			case AUDSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
-				audfile = getcpy(expanddir(cp));
+				audfile = mh_xstrdup(expanddir(cp));
 				continue;
 			case NAUDSW:
 				audfile = NULL;
@@ -225,10 +227,10 @@ main(int argc, char **argv)
 				continue;
 
 			case FILESW:
-				if (!(cp = *argp++) || *cp == '-')
+				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,
@@ -263,7 +265,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else {
 			adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
 					invo_name);
@@ -274,29 +276,31 @@ 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(EX_DATAERR, 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(EX_OSERR, 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();
@@ -313,7 +317,10 @@ main(int argc, char **argv)
 	if (!(mp = folder_read(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);
@@ -350,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 (;;) {
 		/*
@@ -429,7 +451,8 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
-	free(maildir_copy);
+giveup:;
+	mh_free0(&maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {
@@ -464,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);
 	}