summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Denker <jsd@av8n.com>2012-11-23 00:05:50 (GMT)
committerJohn Denker <jsd@av8n.com>2012-11-23 00:05:50 (GMT)
commit38d51b1b20776f7435737bf26d2f912daa312282 (patch)
treea41e9795665655d05009588743b86dc7bd07ce01
parent3c9817f94592907c8c19a8b8f97af87dad3dceaf (diff)
start moving stuff to libskrewt
-rw-r--r--.gitignore1
-rw-r--r--tools/fixown.c1
-rw-r--r--tools/libskrewt.c49
-rw-r--r--tools/libskrewt.h4
-rw-r--r--tools/makefile6
-rw-r--r--tools/ward.c45
6 files changed, 61 insertions, 45 deletions
diff --git a/.gitignore b/.gitignore
index 05e4638..37ba8c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@ wripper
ltgrey
fixown
fixown2
+ward
diff --git a/tools/fixown.c b/tools/fixown.c
index 087e7c9..aefce86 100644
--- a/tools/fixown.c
+++ b/tools/fixown.c
@@ -27,6 +27,7 @@ map<string,owngroup> allowed({
x("fixown", "+root", ""),
x("fixown2", "+root", ""),
x("skrewt", "+qmaild", ""),
+ x("ward", "+qmaild", ""),
x("ltgrey", "+qmaild", ""),
x("greylist", "+qmaild", ""),
x("wripper", "", "+daemon"),
diff --git a/tools/libskrewt.c b/tools/libskrewt.c
new file mode 100644
index 0000000..a756863
--- /dev/null
+++ b/tools/libskrewt.c
@@ -0,0 +1,49 @@
+#include <iostream>
+#include "libskrewt.h"
+
+using namespace std;
+
+void parse_content(const string type_spec_line,
+ string &maintype, string &boundary) {
+ //xxx cerr << "parser called with: " << type_spec_line << endl;
+ string get_type(type_spec_line);
+
+ size_t where = get_type.find_first_of(" \t;\n");
+ string rest;
+ if (where == string::npos) {
+ // keep whole string
+ }
+ else {
+ rest = get_type.substr(where+1);
+ get_type = get_type.substr(0,where);
+ }
+ where = get_type.find("/");
+ if (where == string::npos){
+ maintype = "";
+ cerr << "could not find / in " << get_type << endl;
+ } else {
+ maintype = get_type.substr(0, where);
+ }
+
+// now need to find boundary
+
+ string srch = "boundary=";
+ where = rest.find(srch);
+ if (where != string::npos) {
+ where += srch.length();
+ boundary = rest.substr(where);
+ if (boundary[0] == '"') {
+ boundary = boundary.substr(1);
+ where = boundary.find_first_of("\"");
+ } else {
+ where = boundary.find_first_of(" \t;\n");
+ }
+ if (where == string::npos) {
+ /* do nothing, boundary=boundary as a whole */
+ } else {
+ boundary = boundary.substr(0, where);
+ }
+ } else {
+ //xxxxxxx cerr << "boundary= not found in " << type_spec_line << endl;
+ }
+}
diff --git a/tools/libskrewt.h b/tools/libskrewt.h
new file mode 100644
index 0000000..c9d6721
--- /dev/null
+++ b/tools/libskrewt.h
@@ -0,0 +1,4 @@
+#include <string>
+
+void parse_content(const std::string type_spec_line,
+ std::string &maintype, std::string &boundary);
diff --git a/tools/makefile b/tools/makefile
index 5bd5711..1cb1425 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -32,7 +32,7 @@ beware_other = checkpassword.c spamc.c
| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
[ -s $@ ] || rm -f $@'
-all: $(qprogs) $(moreprogs) fixown2
+all: $(qprogs) $(moreprogs) fixown2 ward
show:
: --- $(qprogs) +++ $(moreprogs)
@@ -51,6 +51,10 @@ skrewt: skrewt.o utils.o sepofra.o
$(CC) $^ -lboost_filesystem-mt -lboost_system -lspf2 -o $@
./fixown $@
+ward: ward.o libskrewt.o utils.o sepofra.o
+ $(CC) $^ -lboost_filesystem-mt -lboost_system -lspf2 -o $@
+ ./fixown $@
+
greylist: greylist.o utils.o
$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
./fixown $@
diff --git a/tools/ward.c b/tools/ward.c
index 540b1cf..8be9f70 100644
--- a/tools/ward.c
+++ b/tools/ward.c
@@ -72,50 +72,7 @@ int mypid;
/* Content-Type: multipart/mixed; boundary="1170861315-1262462055-1341954763=:92165" */
//
-void parse_content(const string type_spec_line,
- string &maintype, string &boundary) {
- //xxx cerr << "parser called with: " << type_spec_line << endl;
- string get_type(type_spec_line);
-
- size_t where = get_type.find_first_of(" \t;\n");
- string rest;
- if (where == string::npos) {
- // keep whole string
- }
- else {
- rest = get_type.substr(where+1);
- get_type = get_type.substr(0,where);
- }
- where = get_type.find("/");
- if (where == string::npos){
- maintype = "";
- cerr << "could not find / in " << get_type << endl;
- } else {
- maintype = get_type.substr(0, where);
- }
-
-// now need to find boundary
-
- string srch = "boundary=";
- where = rest.find(srch);
- if (where != string::npos) {
- where += srch.length();
- boundary = rest.substr(where);
- if (boundary[0] == '"') {
- boundary = boundary.substr(1);
- where = boundary.find_first_of("\"");
- } else {
- where = boundary.find_first_of(" \t;\n");
- }
- if (where == string::npos) {
- /* do nothing, boundary=boundary as a whole */
- } else {
- boundary = boundary.substr(0, where);
- }
- } else {
- //xxxxxxx cerr << "boundary= not found in " << type_spec_line << endl;
- }
-}
+#include "libskrewt.h"
string join(const string sep, const list<string> stuff){
string rslt;