Make use of the functionality provided in the preceding commit

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 0b4ed5c593049f39d707f86733092cc144bdb69c..d8015ccae309f3983acb26a1b609157521ecd7aa 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -149,6 +149,9 @@ void CM_SetField(struct CtdlMessage *Msg, eMsgField which, const char *buf, long
        if (Msg->cm_fields[which] != NULL) {
                free (Msg->cm_fields[which]);
        }
+       if (length < 0) {                       // You can set the length to -1 to have CM_SetField measure it for you
+               length = strlen(buf);
+       }
        Msg->cm_fields[which] = malloc(length + 1);
        memcpy(Msg->cm_fields[which], buf, length);
        Msg->cm_fields[which][length] = '\0';
@@ -256,7 +259,12 @@ void CM_SetAsField(struct CtdlMessage *Msg, eMsgField which, char **buf, long le
 
        Msg->cm_fields[which] = *buf;
        *buf = NULL;
-       Msg->cm_lengths[which] = length;
+       if (length < 0) {                       // You can set the length to -1 to have CM_SetField measure it for you
+               Msg->cm_lengths[which] = strlen(Msg->cm_fields[which]);
+       }
+       else {
+               Msg->cm_lengths[which] = length;
+       }
 }
 
 
@@ -756,7 +764,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string,
                                        free(msglist);
                                        return -1;
                                }
-                               msg = CtdlFetchMessage(msglist[a], 1, 1);
+                               msg = CtdlFetchMessage(msglist[a], 1);
                                if (msg != NULL) {
                                        if (CtdlMsgCmp(msg, compare)) {
                                                msglist[a] = 0L;
@@ -1163,7 +1171,7 @@ struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const cha
  * NOTE: Caller is responsible for freeing the returned CtdlMessage struct
  *       using the CM_Free(); function.
  */
-struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body, int run_msg_hooks)
+struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
 {
        struct cdbdata *dmsgtext;
        struct CtdlMessage *ret = NULL;
@@ -1204,12 +1212,6 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body, int run_msg_hoo
                CM_SetField(ret, eMesageText, HKEY("\r\n\r\n (no text)\r\n"));
        }
 
-       /* Perform "before read" hooks (aborting if any return nonzero) */
-       if (run_msg_hooks && (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0)) {
-               CM_Free(ret);
-               return NULL;
-       }
-
        return (ret);
 }
 
@@ -1596,10 +1598,10 @@ int CtdlOutputMsg(long msg_num,         /* message number (local) to fetch */
         * request that we don't even bother loading the body into memory.
         */
        if (headers_only == HEADERS_FAST) {
-               TheMessage = CtdlFetchMessage(msg_num, 0, 1);
+               TheMessage = CtdlFetchMessage(msg_num, 0);
        }
        else {
-               TheMessage = CtdlFetchMessage(msg_num, 1, 1);
+               TheMessage = CtdlFetchMessage(msg_num, 1);
        }
 
        if (TheMessage == NULL) {
@@ -2394,7 +2396,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
                                msg = supplied_msg;
                        }
                        else {
-                               msg = CtdlFetchMessage(msgid, 0, 1);
+                               msg = CtdlFetchMessage(msgid, 0);
                        }
        
                        if (msg != NULL) {
@@ -2777,7 +2779,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
         * If this message has no O (room) field, generate one.
         */
        if (CM_IsEmpty(msg, eOriginalRoom) && !IsEmptyStr(CC->room.QRname)) {
-               CM_SetField(msg, eOriginalRoom, CC->room.QRname, strlen(CC->room.QRname));
+               CM_SetField(msg, eOriginalRoom, CC->room.QRname, -1);
        }
 
        /* Perform "before save" hooks (aborting if any return nonzero) */
@@ -3000,11 +3002,11 @@ long quickie_message(const char *from,
        msg->cm_format_type = format_type;
 
        if (!IsEmptyStr(from)) {
-               CM_SetField(msg, eAuthor, from, strlen(from));
+               CM_SetField(msg, eAuthor, from, -1);
        }
        else if (!IsEmptyStr(fromaddr)) {
                char *pAt;
-               CM_SetField(msg, eAuthor, fromaddr, strlen(fromaddr));
+               CM_SetField(msg, eAuthor, fromaddr, -1);
                pAt = strchr(msg->cm_fields[eAuthor], '@');
                if (pAt != NULL) {
                        CM_CutFieldAt(msg, eAuthor, pAt - msg->cm_fields[eAuthor]);
@@ -3014,17 +3016,17 @@ long quickie_message(const char *from,
                msg->cm_fields[eAuthor] = strdup("Citadel");
        }
 
-       if (!IsEmptyStr(fromaddr)) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr));
-       if (!IsEmptyStr(room)) CM_SetField(msg, eOriginalRoom, room, strlen(room));
+       if (!IsEmptyStr(fromaddr)) CM_SetField(msg, erFc822Addr, fromaddr, -1);
+       if (!IsEmptyStr(room)) CM_SetField(msg, eOriginalRoom, room, -1);
        if (!IsEmptyStr(to)) {
-               CM_SetField(msg, eRecipient, to, strlen(to));
+               CM_SetField(msg, eRecipient, to, -1);
                recp = validate_recipients(to, NULL, 0);
        }
        if (!IsEmptyStr(subject)) {
-               CM_SetField(msg, eMsgSubject, subject, strlen(subject));
+               CM_SetField(msg, eMsgSubject, subject, -1);
        }
        if (!IsEmptyStr(text)) {
-               CM_SetField(msg, eMesageText, text, strlen(text));
+               CM_SetField(msg, eMesageText, text, -1);
        }
 
        long msgnum = CtdlSubmitMsg(msg, recp, room, 0);
@@ -3215,7 +3217,7 @@ struct CtdlMessage *CtdlMakeMessageLen(
                CM_SetField(msg, eMessagePath, my_email, myelen);
        }
        else if (!IsEmptyStr(author->fullname)) {
-               CM_SetField(msg, eMessagePath, author->fullname, strlen(author->fullname));
+               CM_SetField(msg, eMessagePath, author->fullname, -1);
        }
        convert_spaces_to_underscores(msg->cm_fields[eMessagePath]);
 
@@ -3234,10 +3236,10 @@ struct CtdlMessage *CtdlMakeMessageLen(
 
        if (!!IsEmptyStr(CC->room.QRname)) {
                if (CC->room.QRflags & QR_MAILBOX) {            /* room */
-                       CM_SetField(msg, eOriginalRoom, &CC->room.QRname[11], strlen(&CC->room.QRname[11]));
+                       CM_SetField(msg, eOriginalRoom, &CC->room.QRname[11], -1);
                }
                else {
-                       CM_SetField(msg, eOriginalRoom, CC->room.QRname, strlen(CC->room.QRname));
+                       CM_SetField(msg, eOriginalRoom, CC->room.QRname, -1);
                }
        }
 
@@ -3252,7 +3254,7 @@ struct CtdlMessage *CtdlMakeMessageLen(
                CM_SetField(msg, erFc822Addr, my_email, myelen);
        }
        else if ( (author == &CC->user) && (!IsEmptyStr(CC->cs_inet_email)) ) {
-               CM_SetField(msg, erFc822Addr, CC->cs_inet_email, strlen(CC->cs_inet_email));
+               CM_SetField(msg, erFc822Addr, CC->cs_inet_email, -1);
        }
 
        if (subject != NULL) {
@@ -3606,8 +3608,8 @@ void CtdlWriteObject(char *req_room,                      /* Room to stuff it in */
        msg->cm_magic = CTDLMESSAGE_MAGIC;
        msg->cm_anon_type = MES_NORMAL;
        msg->cm_format_type = 4;
-       CM_SetField(msg, eAuthor, CC->user.fullname, strlen(CC->user.fullname));
-       CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room));
+       CM_SetField(msg, eAuthor, CC->user.fullname, -1);
+       CM_SetField(msg, eOriginalRoom, req_room, -1);
        msg->cm_flags = flags;
        
        CM_SetAsFieldSB(msg, eMesageText, &encoded_message);