State now tracks whether its been opened, rather than segving.

@@ -59,7 +59,7 @@ struct _sendmail
   pid_t pid;
   pid_t pid;
   off_t offset;
   off_t offset;
   int fd;
   int fd;
-  enum sendmail_state { SENDMAIL_NO_STATE, SENDMAIL_SEND } state;
+  enum sendmail_state { SENDMAIL_CLOSED, SENDMAIL_OPEN, SENDMAIL_SEND } state;
 };
 };
 
 
 typedef struct _sendmail * sendmail_t;
 typedef struct _sendmail * sendmail_t;
@@ -78,7 +78,7 @@ _mailer_sendmail_init (mailer_t mailer)
   sendmail = mailer->data = calloc (1, sizeof (*sendmail));
   sendmail = mailer->data = calloc (1, sizeof (*sendmail));
   if (mailer->data == NULL)
   if (mailer->data == NULL)
     return ENOMEM;
     return ENOMEM;
-  sendmail->state = SENDMAIL_NO_STATE;
+  sendmail->state = SENDMAIL_CLOSED;
   mailer->_destroy = sendmail_destroy;
   mailer->_destroy = sendmail_destroy;
   mailer->_open = sendmail_open;
   mailer->_open = sendmail_open;
   mailer->_close = sendmail_close;
   mailer->_close = sendmail_close;
@@ -134,6 +134,7 @@ sendmail_open (mailer_t mailer, int flags)
       return errno;
       return errno;
     }
     }
   sendmail->path = path;
   sendmail->path = path;
+  sendmail->state = SENDMAIL_OPEN;
   MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE, "sendmail (%s)\n", sendmail->path);
   MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE, "sendmail (%s)\n", sendmail->path);
   return 0;
   return 0;
 }
 }
@@ -141,12 +142,24 @@ sendmail_open (mailer_t mailer, int flags)
 static int
 static int
 sendmail_close (mailer_t mailer)
 sendmail_close (mailer_t mailer)
 {
 {
-  (void)mailer;
+  sendmail_t sendmail = mailer->data;
+
+  /* Sanity checks.  */
+  if (sendmail == NULL)
+    return EINVAL;
+
+  if(sendmail->path)
+    free(sendmail->path);
+
+  sendmail->path = NULL;
+  sendmail->state = SENDMAIL_CLOSED;
+
   return 0;
   return 0;
 }
 }
 
 
 static int
 static int
-sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t to)
+sendmail_send_message (mailer_t mailer, message_t msg, address_t from,
+		       address_t to)
 {
 {
   sendmail_t sendmail = mailer->data;
   sendmail_t sendmail = mailer->data;
   int status = 0;
   int status = 0;
@@ -156,7 +169,9 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 
 
   switch (sendmail->state)
   switch (sendmail->state)
     {
     {
-    case SENDMAIL_NO_STATE:
+    case SENDMAIL_CLOSED:
+      return EINVAL;
+    case SENDMAIL_OPEN:
       {
       {
 	int tunnel[2];
 	int tunnel[2];
 	int argc = 0;
 	int argc = 0;
@@ -173,7 +188,7 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	if (from)
 	if (from)
 	  {
 	  {
 	    if ((status = address_aget_email (from, 1, &emailfrom)) != 0)
 	    if ((status = address_aget_email (from, 1, &emailfrom)) != 0)
-	      goto NO_STATE_CLEANUP;
+	      goto OPEN_STATE_CLEANUP;
 
 
 	    if (!emailfrom)
 	    if (!emailfrom)
 	      {
 	      {
@@ -181,9 +196,10 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 		status = EINVAL;
 		status = EINVAL;
 
 
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
-      "envelope from (%s) not fully qualifed\n", emailfrom);
+			       "envelope from (%s) not fully qualifed\n",
+			       emailfrom);
 
 
-		goto NO_STATE_CLEANUP;
+		goto OPEN_STATE_CLEANUP;
 	      }
 	      }
 
 
 	    argc += 2;		/* -f from */
 	    argc += 2;		/* -f from */
@@ -206,7 +222,7 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	if ((argvec = calloc (argc, sizeof (*argvec))) == 0)
 	if ((argvec = calloc (argc, sizeof (*argvec))) == 0)
 	  {
 	  {
 	    status = ENOMEM;
 	    status = ENOMEM;
-	    goto NO_STATE_CLEANUP;
+	    goto OPEN_STATE_CLEANUP;
 	  }
 	  }
 
 
 	argc = 0;
 	argc = 0;
@@ -214,20 +230,20 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	if ((argvec[argc++] = strdup (sendmail->path)) == 0)
 	if ((argvec[argc++] = strdup (sendmail->path)) == 0)
 	  {
 	  {
 	    status = ENOMEM;
 	    status = ENOMEM;
-	    goto NO_STATE_CLEANUP;
+	    goto OPEN_STATE_CLEANUP;
 	  }
 	  }
 
 
 	if ((argvec[argc++] = strdup ("-oi")) == 0)
 	if ((argvec[argc++] = strdup ("-oi")) == 0)
 	  {
 	  {
 	    status = ENOMEM;
 	    status = ENOMEM;
-	    goto NO_STATE_CLEANUP;
+	    goto OPEN_STATE_CLEANUP;
 	  }
 	  }
 	if (from)
 	if (from)
 	  {
 	  {
 	    if ((argvec[argc++] = strdup ("-f")) == 0)
 	    if ((argvec[argc++] = strdup ("-f")) == 0)
 	      {
 	      {
 		status = ENOMEM;
 		status = ENOMEM;
-		goto NO_STATE_CLEANUP;
+		goto OPEN_STATE_CLEANUP;
 	      }
 	      }
 	    argvec[argc++] = emailfrom;
 	    argvec[argc++] = emailfrom;
 	  }
 	  }
@@ -236,7 +252,7 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	    if ((argvec[argc++] = strdup ("-t")) == 0)
 	    if ((argvec[argc++] = strdup ("-t")) == 0)
 	      {
 	      {
 		status = ENOMEM;
 		status = ENOMEM;
-		goto NO_STATE_CLEANUP;
+		goto OPEN_STATE_CLEANUP;
 	      }
 	      }
 	  }
 	  }
 	else
 	else
@@ -250,16 +266,17 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	      {
 	      {
 		char *email = 0;
 		char *email = 0;
 		if ((status = address_aget_email (to, i, &email)) != 0)
 		if ((status = address_aget_email (to, i, &email)) != 0)
-		  goto NO_STATE_CLEANUP;
+		  goto OPEN_STATE_CLEANUP;
 		if (!email)
 		if (!email)
 		  {
 		  {
 		    /* the address wasn't fully qualified, choke (for now) */
 		    /* the address wasn't fully qualified, choke (for now) */
 		    status = EINVAL;
 		    status = EINVAL;
 
 
 		    MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
 		    MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
-      "envelope to (%s) not fully qualifed\n", email);
+				   "envelope to (%s) not fully qualifed\n",
+				   email);
 
 
-		    goto NO_STATE_CLEANUP;
+		    goto OPEN_STATE_CLEANUP;
 		  }
 		  }
 		argvec[argc++] = email;
 		argvec[argc++] = email;
 	      }
 	      }
@@ -286,17 +303,17 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 		status = errno;
 		status = errno;
 
 
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
-		      "vfork() failed: %s\n", strerror(status));
+			       "vfork() failed: %s\n", strerror (status));
 	      }
 	      }
 	  }
 	  }
 	else
 	else
 	  {
 	  {
 	    status = errno;
 	    status = errno;
 	    MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
 	    MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
-		      "pipe() failed: %s\n", strerror(status));
+			   "pipe() failed: %s\n", strerror (status));
 	  }
 	  }
 
 
-      NO_STATE_CLEANUP:
+      OPEN_STATE_CLEANUP:
 	MAILER_DEBUG0 (mailer, MU_DEBUG_TRACE, "exec argv:");
 	MAILER_DEBUG0 (mailer, MU_DEBUG_TRACE, "exec argv:");
 	for (argc = 0; argvec && argvec[argc]; argc++)
 	for (argc = 0; argvec && argvec[argc]; argc++)
 	  {
 	  {
@@ -315,7 +332,7 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	sendmail->state = SENDMAIL_SEND;
 	sendmail->state = SENDMAIL_SEND;
       }
       }
 
 
-    case SENDMAIL_SEND:	/* Parent.  */
+    case SENDMAIL_SEND:
       {
       {
 	stream_t stream = NULL;
 	stream_t stream = NULL;
 	char buffer[512];
 	char buffer[512];
@@ -332,7 +349,7 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 		status = errno;
 		status = errno;
 
 
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
 		MAILER_DEBUG1 (mailer, MU_DEBUG_TRACE,
-		      "write() failed: %s\n", strerror(status));
+			       "write() failed: %s\n", strerror (status));
 
 
 		break;
 		break;
 	      }
 	      }
@@ -340,21 +357,24 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
 	  }
 	  }
 	if (status == EAGAIN)
 	if (status == EAGAIN)
 	  return status;
 	  return status;
+
 	close (sendmail->fd);
 	close (sendmail->fd);
+
 	rc = waitpid (sendmail->pid, &status, 0);
 	rc = waitpid (sendmail->pid, &status, 0);
+
 	if (rc < 0)
 	if (rc < 0)
 	  {
 	  {
 	    status = errno;
 	    status = errno;
 	    MAILER_DEBUG2 (mailer, MU_DEBUG_TRACE,
 	    MAILER_DEBUG2 (mailer, MU_DEBUG_TRACE,
 			   "waitpid(%d) failed: %s\n",
 			   "waitpid(%d) failed: %s\n",
-		      sendmail->pid, strerror(status));
+			   sendmail->pid, strerror (status));
 	  }
 	  }
 	else if (WIFEXITED (status))
 	else if (WIFEXITED (status))
 	  {
 	  {
 	    status = WEXITSTATUS (status);
 	    status = WEXITSTATUS (status);
 	    MAILER_DEBUG2 (mailer, MU_DEBUG_TRACE,
 	    MAILER_DEBUG2 (mailer, MU_DEBUG_TRACE,
 			   "%s exited with: %s\n",
 			   "%s exited with: %s\n",
-		      sendmail->path, strerror(status));
+			   sendmail->path, strerror (status));
 	  }
 	  }
 	/* Shouldn't this notification only happen on success? */
 	/* Shouldn't this notification only happen on success? */
 	observable_notify (mailer->observable, MU_EVT_MAILER_MESSAGE_SENT);
 	observable_notify (mailer->observable, MU_EVT_MAILER_MESSAGE_SENT);
@@ -363,6 +383,9 @@ sendmail_send_message (mailer_t mailer, message_t msg, address_t from, address_t
       break;
       break;
     }
     }
 
 
-  sendmail->state = SENDMAIL_NO_STATE;
+  sendmail->state = SENDMAIL_OPEN;
+
   return status;
   return status;
 }
 }
+
+