mhmail: For mailx(1) compat: A period alone on a line means EOF.

[mmh] / uip / prompter.c

diff --git a/uip/prompter.c b/uip/prompter.c
index a398832..024f604 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -33,11 +33,11 @@ static struct swit switches[] = {
 #define PREPSW  2
        { "prepend", 0 },
 #define NPREPSW  3
-       { "noprepend", 0 },
+       { "noprepend", 2 },
 #define RAPDSW  4
        { "rapid", 0 },
 #define NRAPDSW  5
-       { "norapid", 0 },
+       { "norapid", 2 },
 #define BODYSW  6
        { "body", -4 },
 #define NBODYSW  7
@@ -45,9 +45,9 @@ static struct swit switches[] = {
 #define DOTSW  8
        { "doteof", 0 },
 #define NDOTSW  9
-       { "nodoteof", 0 },
+       { "nodoteof", 2 },
 #define VERSIONSW 10
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  11
        { "help", 0 },
        { NULL, 0 }
@@ -69,7 +69,7 @@ static jmp_buf sigenv;
 int getln(char *, int);
 static int chrcnv(char *);
 static void chrdsp(char *, char);
-static RETSIGTYPE intrser(int);
+static void intrser(int);
 
 
 int
@@ -394,13 +394,9 @@ getln(char *buffer, int n)
 }
 
 
-static RETSIGTYPE
+static void
 intrser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-       SIGNAL(SIGINT, intrser);
-#endif
-
        if (wtuser)
                longjmp(sigenv, NOTOK);
        sigint++;