* citmail.c: changes to citmail to make it usable as a /usr/sbin/sendmail

[citadel.git] / citadel / citmail.c

diff --git a/citadel/citmail.c b/citadel/citmail.c
index e51428187929df17d6acf18d1d21e6d2d2762204..50704818d68e40b8bef2247b9c5cd9ae8d7d1601 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -173,6 +173,8 @@ int main(int argc, char **argv) {
        FILE *fp;
        int i;
        struct passwd *pw;
+       int from_header = 0;
+       int in_body = 0;
 
        get_config();
 
@@ -185,10 +187,19 @@ int main(int argc, char **argv) {
                config.c_fqdn
        );
        while (fgets(buf, 1024, stdin) != NULL) {
-               fprintf(fp, "%s", buf);
+               if ( ( (buf[0] == 13) || (buf[0] == 10)) && (in_body == 0) ) {
+                       in_body = 1;
+                       if (from_header == 0) {
+                               fprintf(fp, "%s%s", fromline, buf);
+                       }
+               }
                if (!strncasecmp(buf, "From:", 5)) {
                        strcpy(fromline, buf);
+                       if (in_body == 0) {
+                               from_header = 1;
+                       }
                }
+               fprintf(fp, "%s", buf);
        }
        strip_trailing_nonprint(fromline);