Prepare tokenizer for filter names.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/.gitignore b/.gitignore
index 10177d5..9d92621 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-/tokens.[hc]
+*_tokens.[hc]
 
-/postlicyd
-/tst-rbl
-/pfix-srsd
+/postlicyd/postlicyd
+/postlicyd/tst-rbl
+/pfix-srsd/pfix-srsd
 
 *.[ao]
 .tags

diff --git a/mk/common.mk b/mk/common.mk
index 3fcb4e4..12e943b 100644 (file)
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -6,13 +6,13 @@ CFLAGS  += --std=gnu99 -D_GNU_SOURCE -I../ -I../common
 
 INSTALL_PROGS = $(addprefix install-,$(PROGRAMS))
 
+all: $(GENERATED) $(LIBS) $(PROGRAMS) | $(GENERATED)
+
 install: all $(INSTALL_PROGS)
 
 $(INSTALL_PROGS): install-%:
        install $* $(DESTDIR)$(prefix)/sbin
 
-all: $(GENERATED) $(LIBS) $(PROGRAMS) | $(GENERATED)
-
 clean:
        $(RM) $(LIBS:=.a) $(PROGRAMS) $(TESTS) .*.o .*.dep
 

diff --git a/postlicyd/Makefile b/postlicyd/Makefile
index 5a0ab49..7331063 100644 (file)
--- a/postlicyd/Makefile
+++ b/postlicyd/Makefile
@@ -32,7 +32,7 @@
 include ../mk/tc.mk
 
 PROGRAMS  = postlicyd
-GENERATED = tokens.h tokens.c
+GENERATED = policy_tokens.h policy_tokens.c filter_tokens.h filter_tokens.c
 TESTS     = test-rbl
 
 postlicyd_SOURCES = greylist.c rbl.c main-postlicyd.c $(GENERATED) ../common/lib.a

diff --git a/postlicyd/filter_tokens.sh b/postlicyd/filter_tokens.sh
new file mode 100755 (executable)
index 0000000..f34d36d
--- /dev/null
+++ b/postlicyd/filter_tokens.sh
@@ -0,0 +1,128 @@
+#! /bin/sh -e
+
+die() {
+    echo "$@" 1>&2
+    exit 2
+}
+
+do_hdr() {
+    cat <<EOF
+/******************************************************************************/
+/*          postlicyd: a postfix policy daemon with a lot of features         */
+/*          ~~~~~~~~~                                                         */
+/*  ________________________________________________________________________  */
+/*                                                                            */
+/*  Redistribution and use in source and binary forms, with or without        */
+/*  modification, are permitted provided that the following conditions        */
+/*  are met:                                                                  */
+/*                                                                            */
+/*  1. Redistributions of source code must retain the above copyright         */
+/*     notice, this list of conditions and the following disclaimer.          */
+/*  2. Redistributions in binary form must reproduce the above copyright      */
+/*     notice, this list of conditions and the following disclaimer in the    */
+/*     documentation and/or other materials provided with the distribution.   */
+/*  3. The names of its contributors may not be used to endorse or promote    */
+/*     products derived from this software without specific prior written     */
+/*     permission.                                                            */
+/*                                                                            */
+/*  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   */
+/*  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE     */
+/*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR        */
+/*  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS    */
+/*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    */
+/*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      */
+/*  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS  */
+/*  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN   */
+/*  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)   */
+/*  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF    */
+/*  THE POSSIBILITY OF SUCH DAMAGE.                                           */
+/******************************************************************************/
+
+/*****     THIS FILE IS AUTOGENERATED DO NOT MODIFY DIRECTLY !    *****/
+
+EOF
+}
+
+do_h() {
+    do_hdr
+    cat <<EOF
+#ifndef PFIXTOOLS_FILTERS_H
+#define PFIXTOOLS_FILTERS_H
+
+typedef enum filter_token {
+    FTK_UNKNOWN = -1,
+`grep_self "$0" | tr 'a-z-/' 'A-Z__' | sed -e 's/.*/    FTK_&,/'`
+    FTK_count,
+} filter_token;
+
+extern const char *ftokens[FTK_count];
+
+__attribute__((pure))
+filter_token filter_tokenize(const char *s, ssize_t len);
+#endif /* MUTT_LIB_LUA_LUA_TOKEN_H */
+EOF
+}
+
+do_tokens() {
+    while read tok; do
+        echo "$tok, FTK_`echo $tok | tr 'a-z-' 'A-Z_'`"
+    done
+}
+
+do_c() {
+    this=`basename "$0"`
+    cat <<EOF | gperf -m16 -l -t -C -F",0" -Ntokenize_aux | \
+        sed -e '/__gnu_inline__/d;s/\<\(__\|\)inline\>//g'
+%{
+`do_hdr`
+
+#include "str.h"
+#include "`echo "${this%.sh}"`.h"
+
+static const struct tok *
+tokenize_aux(const char *str, unsigned int len);
+
+%}
+struct tok { const char *name; int val; };
+%%
+`grep_self "$0" | do_tokens`
+%%
+
+const char *ftokens[FTK_count] = {
+`grep_self "$0" | sed -e 's/.*/    "&",/'`
+};
+
+filter_token filter_tokenize(const char *s, ssize_t len)
+{
+    if (len < 0)
+        len = m_strlen(s);
+
+    if (len) {
+        const struct tok *res = tokenize_aux(s, len);
+        return res ? res->val : FTK_UNKNOWN;
+    } else {
+        return FTK_UNKNOWN;
+    }
+}
+EOF
+}
+
+grep_self() {
+    grep '^## ' "$1" | cut -d' ' -f2
+}
+
+trap "rm -f $1" 1 2 3 15
+rm -f $1
+case "$1" in
+    *.h) do_h > $1;;
+    *.c) do_c > $1;;
+    *)  die "you must ask for the 'h' or 'c' generation";;
+esac
+chmod -w $1
+
+exit 0
+
+############ Put tokens here ############
+## rbl
+## greylist
+## poisonous

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index deb90b3..950e581 100644 (file)
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -39,7 +39,7 @@
 #include "buffer.h"
 #include "common.h"
 #include "epoll.h"
-#include "tokens.h"
+#include "policy_tokens.h"
 #include "server.h"
 
 #define DAEMON_NAME             "postlicyd"
@@ -144,8 +144,8 @@ static int postfix_parsejob(query_t *query, char *p)
         for (vlen = p - v; vlen && isblank(v[vlen]); vlen--);
         p += 1; /* skip \n */
 
-        vtk = tokenize(v, vlen);
-        switch (tokenize(k, klen)) {
+        vtk = policy_tokenize(v, vlen);
+        switch (policy_tokenize(k, klen)) {
 #define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; break;
             CASE(HELO_NAME,           helo_name);
             CASE(QUEUE_ID,            queue_id);

diff --git a/postlicyd/tokens.sh b/postlicyd/policy_tokens.sh
similarity index 95%
rename from postlicyd/tokens.sh
rename to postlicyd/policy_tokens.sh
index 4e1abb3..1a6b0f7 100755 (executable)
--- a/postlicyd/tokens.sh
+++ b/postlicyd/policy_tokens.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/bash -e
 
 die() {
     echo "$@" 1>&2
@@ -58,7 +58,7 @@ typedef enum postlicyd_token {
 extern const char *ptokens[PTK_count];
 
 __attribute__((pure))
-postlicyd_token tokenize(const char *s, ssize_t len);
+postlicyd_token policy_tokenize(const char *s, ssize_t len);
 #endif /* MUTT_LIB_LUA_LUA_TOKEN_H */
 EOF
 }
@@ -70,13 +70,14 @@ do_tokens() {
 }
 
 do_c() {
+    this=`basename "$0"`
     cat <<EOF | gperf -m16 -l -t -C -F",0" -Ntokenize_aux | \
         sed -e '/__gnu_inline__/d;s/\<\(__\|\)inline\>//g'
 %{
 `do_hdr`
 
 #include "str.h"
-#include "tokens.h"
+#include "`echo "${this%.sh}"`.h"
 
 static const struct tok *
 tokenize_aux(const char *str, unsigned int len);
@@ -91,7 +92,7 @@ const char *ptokens[PTK_count] = {
 `grep_self "$0" | sed -e 's/.*/    "&",/'`
 };
 
-postlicyd_token tokenize(const char *s, ssize_t len)
+postlicyd_token policy_tokenize(const char *s, ssize_t len)
 {
     if (len < 0)
         len = m_strlen(s);