From: markus schnalke <meillo@marmaro.de>
Date: Thu, 22 Mar 2012 10:46:47 +0000 (+0100)
Subject: mhmail: Don't invoke inc when called without arguments.
X-Git-Tag: mmh-thesis-end~254
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=d36e56e695fe1c482c7920644bfbb6386ac9edb0;p=mmh

mhmail: Don't invoke inc when called without arguments.
We can't provide a full mailx-replacement anyways. By magically invoking
inc(1), we likely confuse the user. Instead tell him that he can invoke
inc(1) himself. This doesn't mess with the important property: mhmail is
a mailx replacement for scripts to send mail.
---

diff --git a/man/mhmail.man1 b/man/mhmail.man1
index c6a3467..f244ae0 100644
--- a/man/mhmail.man1
+++ b/man/mhmail.man1
@@ -3,18 +3,16 @@
 .\"
 .TH MHMAIL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
-mhmail \- send or read mail
+mhmail \- send mail
 .SH SYNOPSIS
 .HP 5
 .na
 .B mhmail
-.RI [ addrs
-\&...]
+.IR addrs ...
 .RB [ \-body
 .IR text ]
 .RB [ \-cc
-.I addrs
-\&...]
+.IR addrs ...]
 .RB [ \-from
 .IR addr ]
 .RB [ \-subject
@@ -24,20 +22,21 @@ mhmail \- send or read mail
 .ad
 .SH DESCRIPTION
 .B mhmail
-is intended as a replacement for the standard Berkeley
+is intended as an
+.BR mmh -compatible
+replacement for the standard Berkeley
 mail program
 .RB ( mail
 or
-.BR mailx ),
-which is compatible with
-.BR nmh .
+.BR mailx ).
 This program is intended for the use of programs such as
 .BR cron ,
 which expect to send mail automatically to various
-users.  It is also used by various
+addresses.  It is also used by various
 .B nmh
 commands to mail various
-error notifications.  Although
+error notifications.
+Although
 .B mhmail
 can be used interactively,
 it is recommended that
@@ -46,17 +45,20 @@ and
 .B send
 be used instead to send messages.
 .PP
-When invoked without arguments, it simply invokes
-.B inc
-to incorporate new messages from the user's maildrop.  When one or more users
-is specified, a message is read from the standard input and spooled to
+When one or more addresses
+are specified, a message is read from the standard input and spooled to
 a temporary file.
 .B mhmail
 then invokes
-.B post
-with the
-name of the temporary file as its argument to deliver the message to
-the specified user.
+.B spost
+to deliver the message.
+.PP
+.B mhmail
+can not be used for mal reading. Use
+.BR inc ,
+.BR scan ,
+.B show
+instead.
 .PP
 The
 .B \-subject
@@ -96,21 +98,15 @@ header correctly.
 .SH FILES
 .fc ^ ~
 .nf
-.ta \w'%etcdir%/ExtraBigFileName  'u
-^%bindir%/inc~^Program to incorporate maildrop into folder
-^%bindir%/spost~^Program to deliver a message
+.ta \w'%etcdir%/BigFileName  'u
 ^/tmp/mhmail*~^Temporary copy of message
 .fi
 
 .SH "SEE ALSO"
-inc(1), post(8)
+inc(1), scan(1), show(1), post(8)
 
 .SH DEFAULTS
 None
 
 .SH CONTEXT
-If
-.B inc
-is invoked, then
-.BR inc 's
-context changes occur.
+None
diff --git a/uip/mhmail.c b/uip/mhmail.c
index 2b8589f..72771a7 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -60,10 +60,9 @@ main(int argc, char **argv)
 	if (context_foil(NULL) == -1)
 		done(1);
 
-	/* If no arguments, just incorporate new mail */
+	/* Without arguments, exit. */
 	if (argc == 1) {
-		execlp(incproc, mhbasename(incproc), NULL);
-		adios(incproc, "unable to exec");
+		adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
 	}
 
 	arguments = getarguments(invo_name, argc, argv, 0);
@@ -80,7 +79,7 @@ main(int argc, char **argv)
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf),
-						"%s [addrs ... [switches]]",
+						"%s addrs... [switches]",
 						invo_name);
 				print_help(buf, switches, 0);
 				done(1);