Added the temporary file descriptor to the data_start plugin call.

Author: bruceg

backend-qmail.c

@@ -40,7 +40,7 @@ static const response* do_recipient(str* recipient)
   return 0;
 }
 
-static const response* data_start(void)
+static const response* data_start(int fd)
 {
   const char* qh;
 
@@ -49,6 +49,7 @@ static const response* data_start(void)
   if (chdir(qh) == -1) return &resp_no_chdir;
 
   return 0;
+  (void)fd;
 }
 
 static int retry_write(int fd, const char* bytes, unsigned long len)

mailfront.c

@@ -106,10 +106,10 @@ const response* handle_data_start(void)
   const response* resp = 0;
   if ((session.fd = scratchfile()) == -1)
     return &resp_internal;
-  if (session.backend->data_start != 0)
-    resp = session.backend->data_start();
   if (response_ok(resp))
-    MODULE_CALL(data_start, (), 0);
+    MODULE_CALL(data_start, (session.fd), 0);
+  if (session.backend->data_start != 0)
+    resp = session.backend->data_start(session.fd);
   data_response = response_ok(resp)
     ? 0
     : resp;

mailfront.h

@@ -16,7 +16,7 @@ struct plugin
   const response* (*reset)(void);
   const response* (*sender)(str*);
   const response* (*recipient)(str*);
-  const response* (*data_start)(void);
+  const response* (*data_start)(int fd);
   const response* (*data_block)(const char* bytes, unsigned long len);
   const response* (*message_end)(int fd);
 };

plugin-add-received.c

@@ -124,7 +124,7 @@ static const response* init(void)
   return 0;
 }
 
-static const response* data_start(void)
+static const response* data_start(int fd)
 {
   if (session.backend->data_block != 0) {
     received.len = 0;
@@ -136,6 +136,7 @@ static const response* data_start(void)
     return session.backend->data_block(received.s, received.len);
   }
   return 0;
+  (void)fd;
 }
 
 struct plugin plugin = {

plugin-counters.c

@@ -62,7 +62,7 @@ static const response* recipient(str* r)
   (void)r;
 }
 
-static const response* start(void)
+static const response* start(int fd)
 {
   unsigned long maxhops;
   minenv("maxdatabytes", "DATABYTES");
@@ -77,6 +77,7 @@ static const response* start(void)
   in_rec = 1;
   in_dt = 1;
   return 0;
+  (void)fd;
 }
 
 static const response* block(const char* bytes, unsigned long len)

plugin-patterns.c

@@ -86,7 +86,7 @@ static int patterns_read(const char* filename)
   return 1;
 }
 
-static const response* init(void)
+static const response* init(int fd)
 {
   const char* tmp;
   unsigned u;
@@ -101,6 +101,7 @@ static const response* init(void)
   linemode = T_HEADER;
   linepos = 0;
   return 0;
+  (void)fd;
 }
 
 static const response* check_line(void)

plugin.c

@@ -25,7 +25,7 @@ static const response* recipient(str* recipient)
   return 0;
 }
 
-static const response* data_start(void)
+static const response* data_start(int fd)
 {
   return 0;
 }