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

[mmh] / uip / mhmail.c

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 5c7f002..a85899d 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -15,7 +15,7 @@
 
 static struct swit switches[] = {
 #define BODYSW  0
-       { "body text", 0 },
+       { "bodytext text", 0 },
 #define CCSW  1
        { "cc addrs ...", 0 },
 #define FROMSW  2
@@ -42,8 +42,6 @@ main(int argc, char **argv)
 {
        pid_t child_id;
        int status, iscc = 0, nvec;
-       unsigned int i;
-       int somebody;
        char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
        char *from = NULL, *body = NULL, **argp, **arguments;
        char *vec[5], buf[BUFSIZ];
@@ -139,16 +137,24 @@ main(int argc, char **argv)
 
        if (body) {
                fprintf(out, "%s", body);
-               if (*body && *(body + strlen(body) - 1) != '\n')
+               if (*body && body[strlen(body) - 1] != '\n')
                        fputs("\n", out);
        } else {
-               for (somebody = 0; (i = fread(buf, sizeof(*buf), sizeof(buf),
-                               stdin)) > 0; somebody++)
-                       if (fwrite(buf, sizeof(*buf), i, out) != i)
+               int empty = 1;
+
+               while (fgets(buf, sizeof buf, stdin)) {
+                       if (buf[0]=='.' && buf[1]=='\n') {
+                               /* A period alone on a line means EOF. */
+                               break;
+                       }
+                       empty = 0;
+                       if (fputs(buf, out) == EOF) {
                                adios(tmpfil, "error writing");
-               if (!somebody) {
+                       }
+               }
+               if (empty) {
                        unlink(tmpfil);
-                       done(1);
+                       adios(NULL, "not sending message with empty body");
                }
        }
        fclose(out);