more cleanup

7 files changed, 0 insertions, 919 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 7f7e55fd..74ba2ab7 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -55,10 +55,6 @@ librsyslog_la_SOURCES = \
 	statsobj.h \
 	sync.c \
 	sync.h \
-	ctok.c \
-	ctok.h \
-	ctok_token.c \
-	ctok_token.h \
 	stream.c \
 	stream.h \
 	var.c \
diff --git a/runtime/conf.c b/runtime/conf.c
index 413d02bb..8c7bc7b6 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -65,8 +65,6 @@
 #include "srUtils.h"
 #include "errmsg.h"
 #include "net.h"
-#include "ctok.h"
-#include "ctok_token.h"
 #include "rule.h"
 #include "ruleset.h"
 #include "rsconf.h"
@@ -82,8 +80,6 @@ static rsRetVal cfline(rsconf_t *conf, uchar *line, rule_t **pfCurr);
 
 /* static data */
 DEFobjStaticHelpers
-DEFobjCurrIf(ctok)
-DEFobjCurrIf(ctok_token)
 DEFobjCurrIf(module)
 DEFobjCurrIf(errmsg)
 DEFobjCurrIf(net)
@@ -1082,8 +1078,6 @@ CODESTARTObjClassExit(conf)
 	}
 
 	/* release objects we no longer need */
-	objRelease(ctok, CORE_COMPONENT);
-	objRelease(ctok_token, CORE_COMPONENT);
 	objRelease(module, CORE_COMPONENT);
 	objRelease(errmsg, CORE_COMPONENT);
 	objRelease(net, LM_NET_FILENAME);
@@ -1098,8 +1092,6 @@ ENDObjClassExit(conf)
  */
 BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANGE class also in END MACRO! */
 	/* request objects we use */
-	CHKiRet(objUse(ctok, CORE_COMPONENT));
-	CHKiRet(objUse(ctok_token, CORE_COMPONENT));
 	CHKiRet(objUse(module, CORE_COMPONENT));
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 	CHKiRet(objUse(net, LM_NET_FILENAME)); /* TODO: make this dependcy go away! */
diff --git a/runtime/ctok.c b/runtime/ctok.c
deleted file mode 100644
index 19c9bd24..00000000
--- a/runtime/ctok.c
+++ /dev/null
@@ -1,629 +0,0 @@
-/* ctok.c - helper class to tokenize an input stream - which surprisingly
- * currently does not work with streams but with string. But that will
- * probably change over time ;) This class was originally written to support
- * the expression module but may evolve when (if) the expression module is
- * expanded (or aggregated) by a full-fledged ctoken based config parser.
- * Obviously, this class is used together with config files and not any other
- * parse function.
- *
- * Module begun 2008-02-19 by Rainer Gerhards
- *
- * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
- * The rsyslog runtime library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The rsyslog runtime library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <strings.h>
-#include <assert.h>
-
-#include "rsyslog.h"
-#include "template.h"
-#include "ctok.h"
-
-/* static data */
-DEFobjStaticHelpers
-DEFobjCurrIf(ctok_token)
-DEFobjCurrIf(var)
-
-
-/* Standard-Constructor
- */
-BEGINobjConstruct(ctok) /* be sure to specify the object type also in END macro! */
-ENDobjConstruct(ctok)
-
-
-/* ConstructionFinalizer
- * rgerhards, 2008-01-09
- */
-rsRetVal ctokConstructFinalize(ctok_t __attribute__((unused)) *pThis)
-{
-	DEFiRet;
-	RETiRet;
-}
-
-
-/* destructor for the ctok object */
-BEGINobjDestruct(ctok) /* be sure to specify the object type also in END and CODESTART macros! */
-CODESTARTobjDestruct(ctok)
-	/* ... then free resources */
-ENDobjDestruct(ctok)
-
-
-/* unget character from input stream. At most one character can be ungotten.
- * This funtion is only permitted to be called after at least one character
- * has been read from the stream. Right now, we handle the situation simply by
- * moving the string "stream" pointer one position backwards. If we work with
- * real streams (some time), the strm object will handle the functionality
- * itself. -- rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokUngetCharFromStream(ctok_t *pThis, uchar __attribute__((unused)) c)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	--pThis->pp;
-
-	RETiRet;
-}
-
-
-/* get the next character from the input "stream". Note that this version
- * does NOT look for comment characters as end-of-stream, so it is suitable
- * when building constant strings! -- rgerhards, 2010-03-01
- */
-static inline rsRetVal 
-ctokGetCharFromStreamNoComment(ctok_t *pThis, uchar *pc)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pc != NULL);
-
-	/* end of string or begin of comment terminates the "stream" */
-	if(*pThis->pp == '\0') {
-		ABORT_FINALIZE(RS_RET_EOS);
-	} else {
-		*pc = *pThis->pp;
-		++pThis->pp;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* get the next character from the input "stream" (currently just a in-memory
- * string...) -- rgerhards, 2008-02-19
- */
-static rsRetVal 
-ctokGetCharFromStream(ctok_t *pThis, uchar *pc)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pc != NULL);
-
-	CHKiRet(ctokGetCharFromStreamNoComment(pThis, pc));
-	/* begin of comment terminates the "stream"! */
-	if(*pc == '#') {
-		ABORT_FINALIZE(RS_RET_EOS);
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* skip whitespace in the input "stream".
- * rgerhards, 2008-02-19
- */
-static rsRetVal 
-ctokSkipWhitespaceFromStream(ctok_t *pThis)
-{
-	DEFiRet;
-	uchar c;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-
-	CHKiRet(ctokGetCharFromStream(pThis, &c));
-	while(isspace(c)) {
-		CHKiRet(ctokGetCharFromStream(pThis, &c));
-	}
-
-	/* we must unget the one non-whitespace we found */
-	CHKiRet(ctokUngetCharFromStream(pThis, c));
-
-dbgprintf("skipped whitespace, stream now '%s'\n", pThis->pp);
-finalize_it:
-	RETiRet;
-}
-
-
-/* get the next word from the input "stream" (currently just a in-memory
- * string...). A word is anything from the current location until the
- * first non-alphanumeric character. If the word is longer
- * than the provided memory buffer, parsing terminates when buffer length
- * has been reached. A buffer of 128 bytes or more should always be by
- * far sufficient. -- rgerhards, 2008-02-19
- */
-static rsRetVal 
-ctokGetWordFromStream(ctok_t *pThis, uchar *pWordBuf, size_t lenWordBuf)
-{
-	DEFiRet;
-	uchar c;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pWordBuf != NULL);
-	ASSERT(lenWordBuf > 0);
-
-	CHKiRet(ctokSkipWhitespaceFromStream(pThis));
-
-	CHKiRet(ctokGetCharFromStream(pThis, &c));
-	while((isalnum(c) || c == '_' || c == '-') && lenWordBuf > 1) {
-		*pWordBuf++ = c;
-		--lenWordBuf;
-		CHKiRet(ctokGetCharFromStream(pThis, &c));
-	}
-	*pWordBuf = '\0'; /* there is always space for this - see while() */
-
-	/* push back the char that we have read too much */
-	CHKiRet(ctokUngetCharFromStream(pThis, c));
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* read in a constant number
- * This is the "number" ABNF element
- * rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokGetNumber(ctok_t *pThis, ctok_token_t *pToken)
-{
-	DEFiRet;
-	number_t n; /* the parsed number */
-	uchar c;
-	int valC;
-	int iBase;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pToken != NULL);
-
-	pToken->tok = ctok_NUMBER;
-
-	CHKiRet(ctokGetCharFromStream(pThis, &c));
-	if(c == '0') { /* octal? */
-		CHKiRet(ctokGetCharFromStream(pThis, &c));
-		if(c == 'x') { /* nope, hex! */
-			CHKiRet(ctokGetCharFromStream(pThis, &c));
-			c = tolower(c);
-			iBase = 16;
-		} else {
-			iBase = 8;
-		}
-	} else {
-		iBase = 10;
-	}
-		
-	n = 0;
-	/* this loop is quite simple, a variable name is terminated by whitespace. */
-	while(isdigit(c) || (c >= 'a' && c <= 'f')) {
-		if(isdigit(c)) {
-			valC = c - '0';
-		} else {
-			valC = c - 'a' + 10;
-		}
-		
-		if(valC >= iBase) {
-			if(iBase == 8) {
-				ABORT_FINALIZE(RS_RET_INVALID_OCTAL_DIGIT);
-			} else {
-				ABORT_FINALIZE(RS_RET_INVALID_HEX_DIGIT);
-			}
-		}
-		/* we now have the next value and know it is right */
-		n = n * iBase + valC;
-		CHKiRet(ctokGetCharFromStream(pThis, &c));
-		c = tolower(c);
-	}
-
-	/* we need to unget the character that made the loop terminate */
-	CHKiRet(ctokUngetCharFromStream(pThis, c));
-
-	CHKiRet(var.SetNumber(pToken->pVar, n));
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* read in a variable
- * This covers both msgvar and sysvar from the ABNF.
- * rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokGetVar(ctok_t *pThis, ctok_token_t *pToken)
-{
-	DEFiRet;
-	uchar c;
-	cstr_t *pstrVal = NULL;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pToken != NULL);
-
-	CHKiRet(ctokGetCharFromStream(pThis, &c));
-
-	if(c == '$') { /* second dollar, we have a system variable */
-		pToken->tok = ctok_SYSVAR;
-		CHKiRet(ctokGetCharFromStream(pThis, &c)); /* "eat" it... */
-	} else if(c == '!') { /* cee variable indicator */
-		pToken->tok = ctok_CEEVAR;
-		CHKiRet(ctokGetCharFromStream(pThis, &c)); /* "eat" it... */
-	} else {
-		pToken->tok = ctok_MSGVAR;
-	}
-
-	CHKiRet(cstrConstruct(&pstrVal));
-	/* this loop is quite simple, a variable name is terminated when a non-supported
-	 * character is detected. Note that we currently permit a numerical digit as the
-	 * first char, which is not permitted by ABNF. -- rgerhards, 2009-03-10
-	 */
-	while(isalpha(c) || isdigit(c) || (c == '_') || (c == '-')) {
-		CHKiRet(cstrAppendChar(pstrVal, tolower(c)));
-		CHKiRet(ctokGetCharFromStream(pThis, &c));
-	}
-	CHKiRet(ctokUngetCharFromStream(pThis, c)); /* put not processed char back */
-
-	CHKiRet(cstrFinalize(pstrVal));
-
-	CHKiRet(var.SetString(pToken->pVar, pstrVal));
-	pstrVal = NULL;
-
-finalize_it:
-	if(iRet != RS_RET_OK) {
-		if(pstrVal != NULL) {
-			cstrDestruct(&pstrVal);
-		}
-	}
-
-	RETiRet;
-}
-
-
-/* read in a simple string (simpstr in ABNF)
- * rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokGetSimpStr(ctok_t *pThis, ctok_token_t *pToken)
-{
-	DEFiRet;
-	uchar c;
-	int bInEsc = 0;
-	cstr_t *pstrVal;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pToken != NULL);
-
-	pToken->tok = ctok_SIMPSTR;
-
-	CHKiRet(cstrConstruct(&pstrVal));
-	CHKiRet(ctokGetCharFromStreamNoComment(pThis, &c));
-	/* while we are in escape mode (had a backslash), no sequence
-	 * terminates the loop. If outside, it is terminated by a single quote.
-	 */
-	while(bInEsc || c != '\'') {
-		if(bInEsc) {
-			CHKiRet(cstrAppendChar(pstrVal, c));
-			bInEsc = 0;
-		} else {
-			if(c == '\\') {
-				bInEsc = 1;
-			} else {
-				CHKiRet(cstrAppendChar(pstrVal, c));
-			}
-		}
-		CHKiRet(ctokGetCharFromStreamNoComment(pThis, &c));
-	}
-	CHKiRet(cstrFinalize(pstrVal));
-
-	CHKiRet(var.SetString(pToken->pVar, pstrVal));
-	pstrVal = NULL;
-
-finalize_it:
-	if(iRet != RS_RET_OK) {
-		if(pstrVal != NULL) {
-			cstrDestruct(&pstrVal);
-		}
-	}
-
-	RETiRet;
-}
-
-
-/* Unget a token. The token ungotten will be returned the next time
- * ctokGetToken() is called. Only one token can be ungotten at a time.
- * If a second token is ungotten, the first is lost. This is considered
- * a programming error.
- * rgerhards, 2008-02-20
- */
-static rsRetVal
-ctokUngetToken(ctok_t *pThis, ctok_token_t *pToken)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(pToken != NULL);
-	ASSERT(pThis->pUngotToken == NULL);
-
-	pThis->pUngotToken = pToken;
-
-	RETiRet;
-}
-
-
-/* skip an inine comment (just like a C-comment) 
- * rgerhards, 2008-02-20
- */
-static rsRetVal
-ctokSkipInlineComment(ctok_t *pThis)
-{
-	DEFiRet;
-	uchar c;
-	int bHadAsterisk = 0;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-
-	CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
-	while(!(bHadAsterisk && c == '/')) {
-		bHadAsterisk = (c == '*') ? 1 : 0;
-		CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read next */
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-
-/* Get the *next* token from the input stream. This parses the next token and
- * ignores any whitespace in between. End of stream is communicated via iRet.
- * The returned token must either be destructed by the caller OR being passed
- * back to ctokUngetToken().
- * rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
-{
-	DEFiRet;
-	ctok_token_t *pToken;
-	uchar c;
-	uchar szWord[128];
-	int bRetry = 0; /* retry parse? Only needed for inline comments... */
-	cstr_t *pstrVal;
-
-	ISOBJ_TYPE_assert(pThis, ctok);
-	ASSERT(ppToken != NULL);
-
-	/* first check if we have an ungotten token and, if so, provide that
-	 * one back (without any parsing). -- rgerhards, 2008-02-20
-	 */
-	if(pThis->pUngotToken != NULL) {
-		*ppToken = pThis->pUngotToken;
-		pThis->pUngotToken = NULL;
-		FINALIZE;
-	}
-
-	/* setup the stage - create our token */
-	CHKiRet(ctok_token.Construct(&pToken));
-	CHKiRet(ctok_token.ConstructFinalize(pToken));
-
-	/* find the next token. We may loop when we have inline comments */
-	do {
-		bRetry = 0;
-		CHKiRet(ctokSkipWhitespaceFromStream(pThis));
-		CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
-		switch(c) {
-			case '=': /* == */
-				CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
-				pToken->tok = (c == '=')? ctok_CMP_EQ : ctok_INVALID;
-				break;
-			case '!': /* != */
-				CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
-				pToken->tok = (c == '=')? ctok_CMP_NEQ : ctok_INVALID;
-				break;
-			case '<': /* <, <=, <> */
-				CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
-				if(c == '=') {
-					pToken->tok = ctok_CMP_LTEQ;
-				} else if(c == '>') {
-					pToken->tok = ctok_CMP_NEQ;
-				} else {
-					pToken->tok = ctok_CMP_LT;
-				}
-				break;
-			case '>': /* >, >= */
-				CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
-				if(c == '=') {
-					pToken->tok = ctok_CMP_GTEQ;
-				} else {
-					pToken->tok = ctok_CMP_GT;
-				}
-				break;
-			case '+':
-				pToken->tok = ctok_PLUS;
-				break;
-			case '-':
-				pToken->tok = ctok_MINUS;
-				break;
-			case '*':
-				pToken->tok = ctok_TIMES;
-				break;
-			case '/': /* /, /.* ... *./ (comments, mungled here for obvious reasons...) */
-				CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
-				if(c == '*') {
-					/* we have a comment and need to skip it */
-					ctokSkipInlineComment(pThis);
-					bRetry = 1;
-				} else {
-					CHKiRet(ctokUngetCharFromStream(pThis, c)); /* put back, not processed */
-				}
-				pToken->tok = ctok_DIV;
-				break;
-			case '%':
-				pToken->tok = ctok_MOD;
-				break;
-			case '(':
-				pToken->tok = ctok_LPAREN;
-				break;
-			case ')':
-				pToken->tok = ctok_RPAREN;
-				break;
-			case ',':
-				pToken->tok = ctok_COMMA;
-				break;
-			case '&':
-				pToken->tok = ctok_STRADD;
-				break;
-			case '$':
-				CHKiRet(ctokGetVar(pThis, pToken));
-				break;
-			case '\'': /* simple string, this is somewhat more elaborate */
-				CHKiRet(ctokGetSimpStr(pThis, pToken));
-				break;
-			case '"':
-				/* TODO: template string parser */
-				ABORT_FINALIZE(RS_RET_NOT_IMPLEMENTED);
-				break;
-			default:
-				CHKiRet(ctokUngetCharFromStream(pThis, c)); /* push back, we need it in any case */
-				if(isdigit(c)) {
-					CHKiRet(ctokGetNumber(pThis, pToken));
-				} else { /* now we check if we have a multi-char sequence */
-					CHKiRet(ctokGetWordFromStream(pThis, szWord, sizeof(szWord)/sizeof(uchar)));
-					if(!strcasecmp((char*)szWord, "and")) {
-						pToken->tok = ctok_AND;
-					} else if(!strcasecmp((char*)szWord, "or")) {
-						pToken->tok = ctok_OR;
-					} else if(!strcasecmp((char*)szWord, "not")) {
-						pToken->tok = ctok_NOT;
-					} else if(!strcasecmp((char*)szWord, "contains")) {
-						pToken->tok = ctok_CMP_CONTAINS;
-					} else if(!strcasecmp((char*)szWord, "contains_i")) {
-						pToken->tok = ctok_CMP_CONTAINSI;
-					} else if(!strcasecmp((char*)szWord, "startswith")) {
-						pToken->tok = ctok_CMP_STARTSWITH;
-					} else if(!strcasecmp((char*)szWord, "startswith_i")) {
-						pToken->tok = ctok_CMP_STARTSWITHI;
-					} else if(!strcasecmp((char*)szWord, "then")) {
-						pToken->tok = ctok_THEN;
-					} else {
-						/* finally, we check if it is a function */
-						CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
-						if(c == '(') {
-							/* push c back, higher level parser needs it */
-							CHKiRet(ctokUngetCharFromStream(pThis, c));
-							pToken->tok = ctok_FUNCTION;
-							/* fill function name */
-							CHKiRet(cstrConstruct(&pstrVal));
-							CHKiRet(rsCStrSetSzStr(pstrVal, szWord));
-							CHKiRet(cstrFinalize(pstrVal));
-							CHKiRet(var.SetString(pToken->pVar, pstrVal));
-						} else { /* give up... */
-							dbgprintf("parser has an invalid word (token) '%s'\n", szWord);
-							pToken->tok = ctok_INVALID;
-						}
-					}
-				}
-				break;
-		}
-	} while(bRetry); /* warning: do ... while()! */
-
-	*ppToken = pToken;
-	dbgoprint((obj_t*) pToken, "token: %d\n", pToken->tok);
-
-finalize_it:
-/*dbgprintf("ctokGetToken, returns %d, returns token %d, addr %p\n", iRet, (*ppToken)->tok, &((*ppToken)->tok));*/
-	if(iRet != RS_RET_OK) {
-		if(pToken != NULL)
-			ctok_token.Destruct(&pToken);
-	}
-
-	RETiRet;
-}
-
-
-/* property set methods */
-/* simple ones first */
-DEFpropSetMeth(ctok, pp, uchar*)
-
-/* return the current position of pp - most important as currently we do only
- * partial parsing, so the rest must know where to start from...
- * rgerhards, 2008-02-19
- */
-static rsRetVal
-ctokGetpp(ctok_t *pThis, uchar **pp)
-{
-	DEFiRet;
-	ASSERT(pp != NULL);
-	*pp = pThis->pp;
-	RETiRet;
-}
-
-
-/* queryInterface function
- * rgerhards, 2008-02-21
- */
-BEGINobjQueryInterface(ctok)
-CODESTARTobjQueryInterface(ctok)
-	if(pIf->ifVersion != ctokCURR_IF_VERSION) { /* check for current version, increment on each change */
-		ABORT_FINALIZE(RS_RET_INTERFACE_NOT_SUPPORTED);
-	}
-
-	/* ok, we have the right interface, so let's fill it
-	 * Please note that we may also do some backwards-compatibility
-	 * work here (if we can support an older interface version - that,
-	 * of course, also affects the "if" above).
-	 */
-	pIf->Construct = ctokConstruct;
-	pIf->ConstructFinalize = ctokConstructFinalize;
-	pIf->Destruct = ctokDestruct;
-	pIf->Getpp = ctokGetpp;
-	pIf->GetToken = ctokGetToken;
-	pIf->UngetToken = ctokUngetToken;
-	pIf->Setpp = ctokSetpp;
-finalize_it:
-ENDobjQueryInterface(ctok)
-
-
-
-BEGINObjClassInit(ctok, 1, OBJ_IS_CORE_MODULE) /* class, version */
-	/* request objects we use */
-	CHKiRet(objUse(ctok_token, CORE_COMPONENT));
-	CHKiRet(objUse(var, CORE_COMPONENT));
-
-	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, ctokConstructFinalize);
-ENDObjClassInit(ctok)
-
-/* vi:set ai:
- */
diff --git a/runtime/ctok.h b/runtime/ctok.h
deleted file mode 100644
index 591f0838..00000000
--- a/runtime/ctok.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* The ctok object (implements a config file tokenizer).
- *
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
- * The rsyslog runtime library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The rsyslog runtime library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
- */
-#ifndef INCLUDED_CTOK_H
-#define INCLUDED_CTOK_H
-
-#include "obj.h"
-#include "stringbuf.h"
-#include "ctok_token.h"
-
-/* the ctokession object */
-typedef struct ctok_s {
-	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
-	uchar *pp;		/* this points to the next unread character, it is a reminescent of pp in
-				   the config parser code ;) */
-	ctok_token_t *pUngotToken; /* buffer for ctokUngetToken(), NULL if not set */
-} ctok_t;
-
-
-/* interfaces */
-BEGINinterface(ctok) /* name must also be changed in ENDinterface macro! */
-	INTERFACEObjDebugPrint(ctok);
-	INTERFACEpropSetMeth(ctok, pp, uchar*);
-	rsRetVal (*Construct)(ctok_t **ppThis);
-	rsRetVal (*ConstructFinalize)(ctok_t __attribute__((unused)) *pThis);
-	rsRetVal (*Destruct)(ctok_t **ppThis);
-	rsRetVal (*Getpp)(ctok_t *pThis, uchar **pp);
-	rsRetVal (*GetToken)(ctok_t *pThis, ctok_token_t **ppToken);
-	rsRetVal (*UngetToken)(ctok_t *pThis, ctok_token_t *pToken);
-ENDinterface(ctok)
-#define ctokCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
-
-
-/* prototypes */
-PROTOTYPEObj(ctok);
-
-#endif /* #ifndef INCLUDED_CTOK_H */
diff --git a/runtime/ctok_token.c b/runtime/ctok_token.c
deleted file mode 100644
index 8c17f693..00000000
--- a/runtime/ctok_token.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ctok_token - implements the token_t class.
- *
- * Module begun 2008-02-20 by Rainer Gerhards
- *
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
- * The rsyslog runtime library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The rsyslog runtime library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <strings.h>
-#include <assert.h>
-
-#include "rsyslog.h"
-#include "template.h"
-#include "ctok_token.h"
-
-/* static data */
-DEFobjStaticHelpers
-DEFobjCurrIf(var)
-
-
-/* Standard-Constructor
- */
-BEGINobjConstruct(ctok_token) /* be sure to specify the object type also in END macro! */
-	/* TODO: we may optimize the code below and alloc var only if actually
-	 * needed (but we need it quite often)
-	 */
-	CHKiRet(var.Construct(&pThis->pVar));
-	CHKiRet(var.ConstructFinalize(pThis->pVar));
-finalize_it:
-ENDobjConstruct(ctok_token)
-
-
-/* ConstructionFinalizer
- * rgerhards, 2008-01-09
- */
-rsRetVal ctok_tokenConstructFinalize(ctok_token_t __attribute__((unused)) *pThis)
-{
-	DEFiRet;
-	RETiRet;
-}
-
-
-/* destructor for the ctok object */
-BEGINobjDestruct(ctok_token) /* be sure to specify the object type also in END and CODESTART macros! */
-CODESTARTobjDestruct(ctok_token)
-	if(pThis->pVar != NULL) {
-		var.Destruct(&pThis->pVar);
-	}
-ENDobjDestruct(ctok_token)
-
-
-/* get the cstr_t from the token, but do not destruct it. This is meant to
- * be used by a caller who passes on the string to some other function. The
- * caller is responsible for destructing it.
- * rgerhards, 2008-02-20
- */
-static rsRetVal
-ctok_tokenUnlinkVar(ctok_token_t *pThis, var_t **ppVar)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ctok_token);
-	ASSERT(ppVar != NULL);
-
-	*ppVar = pThis->pVar;
-	pThis->pVar = NULL;
-
-	RETiRet;
-}
-
-
-/* tell the caller if the supplied token is a compare operation */
-static int ctok_tokenIsCmpOp(ctok_token_t *pThis)
-{
-	return(pThis->tok >= ctok_CMP_EQ && pThis->tok <= ctok_CMP_GTEQ);
-}
-
-/* queryInterface function
- * rgerhards, 2008-02-21
- */
-BEGINobjQueryInterface(ctok_token)
-CODESTARTobjQueryInterface(ctok_token)
-	if(pIf->ifVersion != ctok_tokenCURR_IF_VERSION) { /* check for current version, increment on each change */
-		ABORT_FINALIZE(RS_RET_INTERFACE_NOT_SUPPORTED);
-	}
-
-	/* ok, we have the right interface, so let's fill it
-	 * Please note that we may also do some backwards-compatibility
-	 * work here (if we can support an older interface version - that,
-	 * of course, also affects the "if" above).
-	 */
-	pIf->Construct = ctok_tokenConstruct;
-	pIf->ConstructFinalize = ctok_tokenConstructFinalize;
-	pIf->Destruct = ctok_tokenDestruct;
-	pIf->UnlinkVar = ctok_tokenUnlinkVar;
-	pIf->IsCmpOp = ctok_tokenIsCmpOp;
-finalize_it:
-ENDobjQueryInterface(ctok_token)
-
-
-BEGINObjClassInit(ctok_token, 1, OBJ_IS_CORE_MODULE) /* class, version */
-	/* request objects we use */
-	CHKiRet(objUse(var, CORE_COMPONENT));
-
-	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, ctok_tokenConstructFinalize);
-ENDObjClassInit(ctok_token)
-
-/* vi:set ai:
- */
diff --git a/runtime/ctok_token.h b/runtime/ctok_token.h
deleted file mode 100644
index 1413c699..00000000
--- a/runtime/ctok_token.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* The ctok_token object
- *
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
- * The rsyslog runtime library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The rsyslog runtime library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
- */
-#ifndef INCLUDED_CTOK_TOKEN_H
-#define INCLUDED_CTOK_TOKEN_H
-
-#include "obj.h"
-#include "var.h"
-
-/* the tokens... I use numbers below so that the tokens can be easier
- * identified in debug output. These ID's are also partly resused as opcodes.
- * As such, they should be kept below 1,000 so that they do not interfer
- * with the rest of the opcodes.
- */
-typedef struct {
-	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
-	enum {
-		ctok_INVALID = 0,
-		ctok_OR = 1,
-		ctok_AND = 2,
-		ctok_PLUS = 3,
-		ctok_MINUS = 4,
-		ctok_TIMES = 5,	 /* "*" */
-		ctok_DIV = 6,
-		ctok_MOD = 7,
-		ctok_NOT = 8,
-		ctok_RPAREN = 9,
-		ctok_LPAREN = 10,
-		ctok_COMMA = 11,
-		ctok_SYSVAR = 12,
-		ctok_MSGVAR = 13,
-		ctok_SIMPSTR = 14,
-		ctok_TPLSTR = 15,
-		ctok_NUMBER = 16,
-		ctok_FUNCTION = 17,
-		ctok_THEN = 18,
-		ctok_STRADD = 19,
-		ctok_CEEVAR = 20,
-		ctok_CMP_EQ = 100, /* all compare operations must be in a row */
-		ctok_CMP_NEQ = 101,
-		ctok_CMP_LT = 102,
-		ctok_CMP_GT = 103,
-		ctok_CMP_LTEQ = 104,
-		ctok_CMP_CONTAINS = 105,
-		ctok_CMP_STARTSWITH = 106,
-		ctok_CMP_CONTAINSI = 107,
-		ctok_CMP_STARTSWITHI = 108,
-		ctok_CMP_GTEQ = 109 /* end compare operations */
-	} tok;
-	var_t *pVar;
-} ctok_token_t;
-
-
-/* interfaces */
-BEGINinterface(ctok_token) /* name must also be changed in ENDinterface macro! */
-	INTERFACEObjDebugPrint(ctok_token);
-	rsRetVal (*Construct)(ctok_token_t **ppThis);
-	rsRetVal (*ConstructFinalize)(ctok_token_t __attribute__((unused)) *pThis);
-	rsRetVal (*Destruct)(ctok_token_t **ppThis);
-	rsRetVal (*UnlinkVar)(ctok_token_t *pThis, var_t **ppVar);
-	int (*IsCmpOp)(ctok_token_t *pThis);
-ENDinterface(ctok_token)
-#define ctok_tokenCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
-
-
-/* prototypes */
-PROTOTYPEObj(ctok_token);
-
-#endif /* #ifndef INCLUDED_CTOK_TOKEN_H */
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c
index c5abcb2a..5d5fdda2 100644
--- a/runtime/rsyslog.c
+++ b/runtime/rsyslog.c
@@ -66,7 +66,6 @@
 #include "stringbuf.h"
 #include "wti.h"
 #include "wtp.h"
-#include "ctok.h"
 #include "datetime.h"
 #include "queue.h"
 #include "conf.h"
@@ -173,10 +172,6 @@ rsrtInit(char **ppErrObj, obj_if_t *pObjIF)
 		CHKiRet(glblClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "msg";
 		CHKiRet(msgClassInit(NULL));
-		if(ppErrObj != NULL) *ppErrObj = "ctok_token";
-		CHKiRet(ctok_tokenClassInit(NULL));
-		if(ppErrObj != NULL) *ppErrObj = "ctok";
-		CHKiRet(ctokClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "sysvar";
 		CHKiRet(sysvarClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "rule";