Imported Upstream version 4.2.0upstream/4.2.0

1 files changed, 5 insertions, 3 deletions

diff --git a/template.h b/template.h
index 04137b0..9d794f6 100644
--- a/template.h
+++ b/template.h
@@ -94,9 +94,10 @@ struct templateEntry {
 				unsigned bSpaceCC: 1;		/* change control characters to spaceescape? */
 				unsigned bEscapeCC: 1;		/* escape control characters? */
 				unsigned bDropLastLF: 1;	/* drop last LF char in msg (PIX!) */
-				unsigned bSecPathDrop: 1;		/* drop slashes, replace dots, empty string */
-				unsigned bSecPathReplace: 1;		/* replace slashes, replace dots, empty string */
-				unsigned bSPIffNo1stSP: 1;		/* replace slashes, replace dots, empty string */
+				unsigned bSecPathDrop: 1;	/* drop slashes, replace dots, empty string */
+				unsigned bSecPathReplace: 1;	/* replace slashes, replace dots, empty string */
+				unsigned bSPIffNo1stSP: 1;	/* replace slashes, replace dots, empty string */
+				unsigned bCSV: 1;		/* format field in CSV (RFC 4180) format */
 			} options;		/* options as bit fields */
 		} field;
 	} data;
@@ -125,6 +126,7 @@ void tplLastStaticInit(struct template *tpl);
  * BEFORE msg.h, even if your code file does not actually need it.
  * rgerhards, 2007-08-06
  */
+rsRetVal tplToArray(struct template *pTpl, msg_t *pMsg, uchar*** ppArr);
 rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar** ppSz);
 rsRetVal doSQLEscape(uchar **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode);