- MailQEntry *ThisItem = vQE;
- int i;
-
- if (!ThisItem->Active)
- continue; /* skip already sent ones from the spoolfile. */
-
- for (i=0; i < ThisItem->nAttempts; i++) {
- StrBufAppendBufPlain(QMessage, HKEY("\nretry|"), 0);
- StrBufAppendPrintf(QMessage, "%ld",
- ThisItem->Attempts[i].retry);
-
- StrBufAppendBufPlain(QMessage, HKEY("\nattempted|"), 0);
- StrBufAppendPrintf(QMessage, "%ld",
- ThisItem->Attempts[i].when);
- }
- StrBufAppendBufPlain(QMessage, HKEY("\nremote|"), 0);
- StrBufAppendBuf(QMessage, ThisItem->Recipient, 0);
- StrBufAppendBufPlain(QMessage, HKEY("|"), 0);
- StrBufAppendPrintf(QMessage, "%d", ThisItem->Status);
- StrBufAppendBufPlain(QMessage, HKEY("|"), 0);
- StrBufAppendBuf(QMessage, ThisItem->StatusMessage, 0);
- }
- DeleteHashPos(&It);
- StrBufAppendBufPlain(QMessage, HKEY("\n"), 0);
- return QMessage;
-}
-
-void FinalizeMessageSend(SmtpOutMsg *Msg)
-{
- int IDestructQueItem;
- HashPos *It;
-
- citthread_mutex_lock(&ActiveQItemsLock);
- Msg->MyQItem->ActiveDeliveries--;
- IDestructQueItem = Msg->MyQItem->ActiveDeliveries == 0;
- citthread_mutex_unlock(&ActiveQItemsLock);
-
- if (IDestructQueItem) {
- int nRemain;
- StrBuf *MsgData;
-
- nRemain = CountActiveQueueEntries(Msg->MyQItem);
-
- if (nRemain > 0)
- MsgData = SerializeQueueItem(Msg->MyQItem);
- /*
- * Uncompleted delivery instructions remain, so delete the old
- * instructions and replace with the updated ones.
- */
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
-
- /* Generate 'bounce' messages * /
- smtp_do_bounce(instr); */
- if (nRemain > 0) {
- struct CtdlMessage *msg;
- msg = malloc(sizeof(struct CtdlMessage));
- memset(msg, 0, sizeof(struct CtdlMessage));
- msg->cm_magic = CTDLMESSAGE_MAGIC;
- msg->cm_anon_type = MES_NORMAL;
- msg->cm_format_type = FMT_RFC822;
- msg->cm_fields['M'] = SmashStrBuf(&MsgData);
-
+ struct CtdlMessage *msg;
+ msg = malloc(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = MES_NORMAL;
+ msg->cm_format_type = FMT_RFC822;
+ msg->cm_fields['M'] = SmashStrBuf(&MsgData);
+ Msg->MyQItem->QueMsgID =