@@ -53,6 +53,7 @@

 #include "mbox.h"

 #include "clamav.h"

+#include "json_api.h"

 #ifndef isblank

 #define isblank(c)	(((c) == ' ') || ((c) == '\t'))

@@ -199,6 +200,11 @@ messageReset(message *m)

 		free(m->encodingTypes);

 	}

+#if HAVE_JSON

+	if(m->jobj)

+		cli_json_delobj(m->jobj);

+#endif

+

 	memset(m, '\0', sizeof(message));

 	m->mimeType = NOMIME;

 }

@@ -2630,3 +2636,15 @@ isuuencodebegin(const char *line)

 		isdigit(line[6]) && isdigit(line[7]) &&

 		isdigit(line[8]) && (line[9] == ' ');

 }

+

+#if HAVE_JSON

+json_object *messageGetJObj(message *m)

+{

+	assert(m != NULL);

+

+	if(m->jobj == NULL)

+		m->jobj = cli_jsonobj(NULL, NULL);

+

+	return m->jobj;

+}

+#endif

@@ -22,6 +22,8 @@

 #ifndef	_MESSAGE_H

 #define	_MESSAGE_H

+#include "json_api.h"

+

 /* The contents could change, ONLY access in message.c */

 typedef struct message {

 	encoding_type	*encodingTypes;

@@ -49,6 +51,9 @@ typedef struct message {

 	unsigned	int	isInfected : 1;

 	unsigned        int     isTruncated  : 1;

+#if HAVE_JSON

+	json_object *jobj;

+#endif

 } message;

 message	*messageCreate(void);

@@ -85,5 +90,8 @@ int	isuuencodebegin(const char *line);

 void	messageSetCTX(message *m, cli_ctx *ctx);

 int	messageContainsVirus(const message *m);

 int messageSavePartial(message *m, const char *dir, const char *id, unsigned part);

+#if HAVE_JSON

+json_object *messageGetJObj(message *m);

+#endif

 #endif	/*_MESSAGE_H*/