Fix uip/whom.c for C89 compatibility

[mmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index c1665b2..d7691db 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -73,6 +73,7 @@ static struct swit switches[] = {
        { NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -268,6 +269,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
        */
        switch (attach(drft)) {
        case OK:
+               /* successfully MIMEified: use generate draft */
                drft = composition_file_name;
                break;
 
@@ -275,6 +277,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
                return (NOTOK);
 
        case DONE:
+               /* already in MIME format: keep original draft */
                break;
        }
 
@@ -327,29 +330,17 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 }
 
 static int
-contains_non_ascii(char *str)
-{
-       unsigned char *cp;
-
-       for (cp = str; *cp; cp++) {
-               if (*cp > 127) {
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-static int
 attach(char *draft_file_name)
 {
        char buf[MAXPATHLEN + 6];
        int c;
-       int has_attachment;
-       int has_body = 0;
-       int non_ascii = 0; /* msg body or hdr contains non-ASCII chars */
-       int length;  /* length of attachment header field name */
+       int length = strlen(attach_hdr);
        char *p;
 
+       if(distfile) {
+               return DONE;
+       }
+
        if (!(draft_file = fopen(draft_file_name, "r"))) {
                adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
        }
@@ -358,47 +349,7 @@ attach(char *draft_file_name)
        field = mh_xcalloc(field_size = 256, sizeof(char));
 
        /*
-       ** Scan the draft file for an attachment header field name.
-       */
-       length = strlen(attach_hdr);
-       has_attachment = 0;
-       while (get_line() != EOF && *field != '\0' && *field != '-') {
-               if (strncasecmp(field, attach_hdr, length)==0 &&
-                               field[length] == ':') {
-                       has_attachment = 1;
-               }
-               if (contains_non_ascii(field)) {
-                       non_ascii = 1;
-               }
-       }
-
-       /*
-       ** Look for at least one non-blank line in the body of the
-       ** message which indicates content in the body.
-       ** Check if body contains at least one non-blank (= not empty)
-       ** and if it contains any non-ASCII chars (= need MIME).
-       */
-       while (get_line() != EOF) {
-               if (contains_non_ascii(field)) {
-                       non_ascii = 1;
-               }
-               for (p = field; *p; p++) {
-                       if (isgraph(*p)) {
-                               has_body = 1;
-                       }
-               }
-               if (has_body && non_ascii) {
-                       break;  /* that's been already enough information */
-               }
-       }
-
-       if (!has_attachment && non_ascii==0) {
-               /* We don't need to convert it to MIME. */
-               return DONE;
-       }
-
-       /*
-       ** Else: mimify
+       ** MIMEify
        */
 
        /* Make names for the temporary files.  */
@@ -409,12 +360,10 @@ attach(char *draft_file_name)
                        m_mktemp(toabsdir(invo_name), NULL, NULL),
                        sizeof (composition_file_name));
 
-       if (has_body) {
-               body_file = fopen(body_file_name, "w");
-       }
+       body_file = fopen(body_file_name, "w");
        composition_file = fopen(composition_file_name, "w");
 
-       if ((has_body && !body_file) || !composition_file) {
+       if (!body_file || !composition_file) {
                clean_up_temporary_files();
                adios(EX_IOERR, NULL, "unable to open all of the temporary files.");
        }
@@ -422,6 +371,16 @@ attach(char *draft_file_name)
        /* Copy non-attachment header fields to the temp composition file. */
        rewind(draft_file);
        while (get_line() != EOF && *field && *field != '-') {
+               if (strncasecmp(field, VRSN_FIELD, strlen(VRSN_FIELD))==0 &&
+                               field[strlen(VRSN_FIELD)] == ':') {
+                       /*
+                       ** The draft is already in MIME format, thus
+                       ** back out and use the original draft file.
+                       */
+                       clean_up_temporary_files();
+                       return DONE;
+               }
+
                if (strncasecmp(field, attach_hdr, length) != 0 ||
                                field[length] != ':') {
                        fprintf(composition_file, "%s\n", field);
@@ -429,17 +388,15 @@ attach(char *draft_file_name)
        }
        fputs("--------\n", composition_file);
 
-       if (has_body) {
-               /* Copy the message body to the temporary file. */
-               while ((c = getc(draft_file)) != EOF) {
-                       putc(c, body_file);
-               }
-               fclose(body_file);
-
-               /* Add a mhbuild MIME composition file line for the body */
-               /* charset will be discovered/guessed by mhbuild */
-               fprintf(composition_file, "#text/plain %s\n", body_file_name);
+       /* Copy the message body to the temporary file. */
+       while ((c = getc(draft_file)) != EOF) {
+               putc(c, body_file);
        }
+       fclose(body_file);
+
+       /* Add a mhbuild MIME composition file line for the body */
+       /* charset will be discovered/guessed by mhbuild */
+       fprintf(composition_file, "#text/plain %s\n", body_file_name);
 
        /*
        ** Now, go back to the beginning of the draft file and look for
@@ -486,6 +443,10 @@ signandenc(char *draft_file_name)
        int doenc = 0;
        int ret;
 
+       if(distfile) {
+               return DONE;
+       }
+
        if (!(draft_file = fopen(draft_file_name, "r"))) {
                adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
        }
@@ -681,7 +642,6 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
                }
        }
 
-
        return status ? NOTOK : status;
 }