summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile13
-rw-r--r--src/config.c113
-rw-r--r--src/dbase.c36
-rw-r--r--src/dstring.c9
-rw-r--r--src/pop3.c5
5 files changed, 143 insertions, 33 deletions
diff --git a/src/Makefile b/src/Makefile
index 481148b..808d8ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,10 +18,11 @@
#
# -------------------------------------------------------------------------
#
-# $Id: Makefile,v 1.3 2003-12-05 19:38:37 ianc Exp $
+# $Id: Makefile,v 1.4 2003-12-08 02:20:14 ianc Exp $
#
-CFLAGS += -g
+# CFLAGS assumes that gcc is being used - simply comment out if required
+CFLAGS = -g -Wall -Werror
TARGET = kbs
@@ -60,8 +61,8 @@ kbs.o: /usr/include/limits.h /usr/include/sys/limits.h
kbs.o: /usr/include/machine/_limits.h /usr/include/sys/syslimits.h
kbs.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
kbs.o: /usr/include/stdarg.h /usr/include/time.h /usr/include/sys/timespec.h
-kbs.o: /usr/include/errno.h global.h config.h pop3.h msg.h dbase.h dstring.h
-kbs.o: util.h
+kbs.o: /usr/include/errno.h global.h config.h pop3.h msg.h dbase.h rexp.h
+kbs.o: dstring.h util.h
pop3.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
pop3.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
pop3.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
@@ -80,12 +81,12 @@ config.o: /usr/include/errno.h /usr/include/ctype.h /usr/include/runetype.h
config.o: global.h config.h dstring.h dbase.h msg.h rexp.h util.h
rexp.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
rexp.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-rexp.o: /usr/include/regex.h global.h rexp.h config.h
+rexp.o: /usr/include/regex.h global.h rexp.h config.h util.h
dbase.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
dbase.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
dbase.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
dbase.o: /usr/include/ctype.h /usr/include/runetype.h global.h dbase.h msg.h
-dbase.o: dstring.h config.h rexp.h util.h
+dbase.o: rexp.h dstring.h config.h util.h
dstring.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
dstring.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
dstring.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
diff --git a/src/config.c b/src/config.c
index 616fabf..268198d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -53,6 +53,7 @@ typedef enum {
TOK_BlockUser,
TOK_AllowSubject,
TOK_BlockSubject,
+ TOK_SubjectMacro,
TOK_VarHostname,
TOK_VarPort,
TOK_VarUsername,
@@ -77,10 +78,17 @@ typedef struct Command
Token token;
} Command;
+typedef struct
+ {
+ char *macro;
+ char *expansion;
+ } Macro;
+
/* ---------------------------------------- GLOBALS
*/
static DString error;
+
static char *hostname=NULL;
static char *username=NULL;
static char *password=NULL;
@@ -93,6 +101,9 @@ static int testmode=FALSE;
static int blockhtml=FALSE;
static int verbose=TRUE;
+static int no_macro=0;
+static Macro *macro=NULL;
+
/* ---------------------------------------- COMMAND TABLE
*/
@@ -110,6 +121,7 @@ static const Command cmd_table[]=
{"block_user", TOK_BlockUser},
{"allow_subject", TOK_AllowSubject},
{"block_subject", TOK_BlockSubject},
+ {"subject_macro", TOK_SubjectMacro},
/* Variables
*/
@@ -143,6 +155,48 @@ static const Command cmd_table[]=
static Token GetToken(FILE *fp, DString *ret);
+/* ---------------------------------------- COMMAND HANDLER UTILS
+*/
+static DString ExpandRE(DString re)
+{
+ DString new;
+ Macro *m;
+ char *p;
+ int f;
+
+ new=DSInit();
+
+ p=re->text;
+
+ while(*p)
+ {
+ m=NULL;
+
+ for(f=0;f<no_macro && !m;f++)
+ {
+ if (strncmp(p,macro[f].macro,strlen(macro[f].macro))==0)
+ {
+ m=macro+f;
+ }
+ }
+
+ if (!m)
+ {
+ DSAddChar(new,*p);
+ p++;
+ }
+ else
+ {
+ DSAddCP(new,m->expansion);
+ p+=strlen(m->macro);
+ }
+ }
+
+ DSFree(re);
+ return new;
+}
+
+
/* ---------------------------------------- COMMAND HANDLERS
*/
static int DoSet(FILE *fp)
@@ -252,7 +306,6 @@ static int DoDomain(FILE *fp)
{
DString ds;
Token tok;
- int status=TRUE;
Domain *domain;
RE_Expression re;
@@ -327,6 +380,8 @@ static int DoDomain(FILE *fp)
case TOK_AllowSubject:
GetToken(fp,&ds);
+ ds=ExpandRE(ds);
+
if (!(re=RECompile(ds->text)))
{
DSAddCP(error,"Bad regular expression: ");
@@ -341,6 +396,8 @@ static int DoDomain(FILE *fp)
case TOK_BlockSubject:
GetToken(fp,&ds);
+ ds=ExpandRE(ds);
+
if (!(re=RECompile(ds->text)))
{
DSAddCP(error,"Bad regular expression: ");
@@ -371,7 +428,6 @@ static int DoTrustedUsers(FILE *fp)
{
DString ds;
Token tok;
- int status=TRUE;
ds=DSInit();
@@ -406,7 +462,6 @@ static int DoTrustedDomains(FILE *fp)
{
DString ds;
Token tok;
- int status=TRUE;
ds=DSInit();
@@ -433,6 +488,42 @@ static int DoTrustedDomains(FILE *fp)
}
+static int DoSubjectMacro(FILE *fp)
+{
+ DString arg[2];
+ int f;
+
+ for(f=0;f<2;f++)
+ {
+ arg[f]=DSInit();
+
+ if (GetToken(fp,&arg[f])==TOK_EOF)
+ {
+ DSAddCP(error,"Unexpected EOF in subject_macro");
+ return FALSE;
+ }
+ }
+
+ if (arg[0]->len==0 || arg[1]->len==0)
+ {
+ DSAddCP(error,"Can't use zero length strings in subject_macro");
+ return FALSE;
+ }
+
+ no_macro++;
+
+ macro=Realloc(macro,sizeof *macro * no_macro);
+
+ macro[no_macro-1].macro=CopyStr(arg[0]->text);
+ macro[no_macro-1].expansion=CopyStr(arg[1]->text);
+
+ for(f=0;f<2;f++)
+ DSFree(arg[f]);
+
+ return TRUE;
+}
+
+
/* ---------------------------------------- PRVIVATE FUNCTIONS
*/
static int Getc(FILE *fp)
@@ -570,7 +661,6 @@ static int Parse(FILE *fp)
{
DString txt;
Token tok;
- char *p;
txt=DSInit();
@@ -600,6 +690,11 @@ static int Parse(FILE *fp)
ok=FALSE;
break;
+ case TOK_SubjectMacro:
+ if (!DoSubjectMacro(fp))
+ ok=FALSE;
+ break;
+
case TOK_Expression:
DSAddCP(error,"Unknown command in config file: ");
DSAddDS(error,txt);
@@ -725,6 +820,16 @@ int ConfigInt(ConfigIntVar var)
void ConfigClose(void)
{
+ int f;
+
+ for(f=0;f<no_macro;f++)
+ {
+ free(macro[f].macro);
+ free(macro[f].expansion);
+ }
+
+ free(macro);
+
DSFree(error);
free(hostname);
free(username);
diff --git a/src/dbase.c b/src/dbase.c
index aed142d..43fe0b5 100644
--- a/src/dbase.c
+++ b/src/dbase.c
@@ -236,7 +236,8 @@ int DBBlockMessage(const POP3Message *msg)
return FALSE;
if (ConfigInt(CONFIG_BLOCKHTML) &&
- strncmp(msg->content_type,html,strlen(html))==0)
+ (strncmp(msg->content_type,html,strlen(html))==0 ||
+ strcmp(msg->content_type,"UNKNOWN")==0))
{
reason="HTML message";
return TRUE;
@@ -245,22 +246,6 @@ int DBBlockMessage(const POP3Message *msg)
if (!(dom=GetDomain(msg->from_domain)))
return FALSE;
- for(f=0;f<dom->no_user;f++)
- {
- int res;
-
- if (ConfigInt(CONFIG_CASESENSE))
- res=strcmp(dom->user[f],msg->from_uname);
- else
- res=strcasecmp(dom->user[f],msg->from_uname);
-
- if (res==0)
- {
- reason="disallowed name";
- return TRUE;
- }
- }
-
ds=DSInit();
if (ConfigInt(CONFIG_DEJUNK))
@@ -277,6 +262,23 @@ int DBBlockMessage(const POP3Message *msg)
}
}
+ for(f=0;f<dom->no_user;f++)
+ {
+ int res;
+
+ if (ConfigInt(CONFIG_CASESENSE))
+ res=strcmp(dom->user[f],msg->from_uname);
+ else
+ res=strcasecmp(dom->user[f],msg->from_uname);
+
+ if (res==0)
+ {
+ DSFree(ds);
+ reason="disallowed name";
+ return TRUE;
+ }
+ }
+
for(f=0;f<dom->no_block;f++)
{
if (RESearch(dom->block[f],ds->text))
diff --git a/src/dstring.c b/src/dstring.c
index e614e83..7e13067 100644
--- a/src/dstring.c
+++ b/src/dstring.c
@@ -87,6 +87,8 @@ DString DSAddChar(DString to, char c)
to->text[to->len++]=c;
to->text[to->len]=0;
+
+ return to;
}
@@ -96,15 +98,16 @@ DString DSAddCP(DString to, const char *from)
to->text=Realloc(to->text,(((to->len+1)/BLOCKSIZE)+1)*BLOCKSIZE);
strcat(to->text,from);
+
+ return to;
}
DString DSAddDS(DString to, const DString from)
{
- to->len+=from->len;
- to->text=Realloc(to->text,(((to->len+1)/BLOCKSIZE)+1)*BLOCKSIZE);
+ DSAddCP(to,from->text);
- strcat(to->text,from->text);
+ return to;
}
diff --git a/src/pop3.c b/src/pop3.c
index 660283e..d9fab19 100644
--- a/src/pop3.c
+++ b/src/pop3.c
@@ -31,6 +31,7 @@ static const char id[]="$Id$";
#include <stdarg.h>
#include <ctype.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/select.h>
#include <sys/socket.h>
@@ -183,7 +184,6 @@ static int GetChar(void)
static char buff[BLOCKSIZE];
static ssize_t len=0;
static int ptr=0;
- int ch;
if (len==0 || ptr==len)
{
@@ -214,10 +214,9 @@ static int GetChar(void)
static int GetLine(DString t)
{
- size_t size;
int done;
- int ch;
int last;
+ int ch;
done=FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 21:53:06 +0000