merging erik quanstros nupas

7 files changed, 114 insertions, 0 deletions

diff --git a/sys/src/cmd/upas/binscripts/isspam.rc b/sys/src/cmd/upas/binscripts/isspam.rc
new file mode 100755
index 000000000..6d8107f58
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/isspam.rc
@@ -0,0 +1,2 @@
+#!/bin/rc
+exec /mail/lib/isspam.rc $*
diff --git a/sys/src/cmd/upas/binscripts/mkfile b/sys/src/cmd/upas/binscripts/mkfile
new file mode 100644
index 000000000..ea125f725
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/mkfile
@@ -0,0 +1,34 @@
+</$objtype/mkfile
+<../mkupas
+
+RCFILES=isspam\
+	msgcat\
+	spam\
+	tfmt\
+	unspam\
+
+all:Q:
+	;
+
+installall:Q:	install
+	;
+
+install:V: ${RCFILES:%=$BIN/%}
+
+safeinstall:V: install
+
+safeinstallall:V: install
+
+clean:Q:
+	;
+nuke:V:
+	rm $BIN/^($RCFILES)
+
+UPDATE=$RCFILES
+
+update:V:
+	update $UPDATEFLAGS $UPDATE
+
+$BIN/%: %.rc
+	cp $stem.rc $BIN/$stem
+
diff --git a/sys/src/cmd/upas/binscripts/mkfile.rc b/sys/src/cmd/upas/binscripts/mkfile.rc
new file mode 100644
index 000000000..c3593840b
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/mkfile.rc
@@ -0,0 +1,38 @@
+
+RCFILES=mail.rc\
+
+all:Q:
+	;
+
+installall:Q:	install
+	;
+
+install:V:
+	cp mail.rc /rc/bin/mail
+
+safeinstall:V:
+	cp mail.rc /rc/bin/mail
+
+safeinstallall:V:
+	cp mail.rc /rc/bin/mail
+
+clean:Q:
+	;
+nuke:V:
+	rm /rc/bin/mail
+
+UPDATE=\
+	gone.fishing\
+	gone.msg\
+	mail.rc\
+	mail.sh\
+	makefile\
+	mkfile\
+	namefiles\
+	omail.rc\
+	qmail\
+	remotemail\
+	rewrite\
+
+update:V:
+	update $UPDATEFLAGS $UPDATE
diff --git a/sys/src/cmd/upas/binscripts/msgcat.rc b/sys/src/cmd/upas/binscripts/msgcat.rc
new file mode 100755
index 000000000..f6f536bb6
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/msgcat.rc
@@ -0,0 +1,11 @@
+#!/bin/rc
+
+f=$*
+if(~ $#f 0)
+	f=/mail/fs/mbox/[0-9]*
+f=`{echo $f|sed s:/mail/fs/mbox/::g}
+
+{
+	for(i in $f)
+		echo $i p
+} | upas/nedmail >[2=]
diff --git a/sys/src/cmd/upas/binscripts/spam.rc b/sys/src/cmd/upas/binscripts/spam.rc
new file mode 100755
index 000000000..88dda04b6
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/spam.rc
@@ -0,0 +1,2 @@
+#!/bin/rc
+exec /mail/lib/spam.rc $*
diff --git a/sys/src/cmd/upas/binscripts/tfmt.rc b/sys/src/cmd/upas/binscripts/tfmt.rc
new file mode 100755
index 000000000..c5e664128
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/tfmt.rc
@@ -0,0 +1,25 @@
+#!/bin/rc
+# anti-topposting defense
+
+# sed '/^[ 	]*>[ 	]*>[ 	]*>/q'
+
+awk '
+{
+	if(l[i] ~ /^[ 	]*>[ 	]*>[ 	]*>/)
+		q = 1
+	if(q == 0)
+		l[i = NR] = $0;
+}
+END{
+	for(; i > 1; i--)
+		if(l[i] !~ /^([ 	]*>)*[ 	]*$/)
+			break;
+	for(; i > 1; i--)
+		if(l[i] !~ /^[ 	]*>[ 	]*>/)
+			break;
+	for(; i > 1; i--)
+		if(l[i] !~ /^([ 	]*>)*[ 	]*$/)
+			break;
+	for(j = 1; j <= i; j++)
+		print l[j]
+}' |dd -conv block >[2=]
diff --git a/sys/src/cmd/upas/binscripts/unspam.rc b/sys/src/cmd/upas/binscripts/unspam.rc
new file mode 100755
index 000000000..04213f3f7
--- /dev/null
+++ b/sys/src/cmd/upas/binscripts/unspam.rc
@@ -0,0 +1,2 @@
+#!/bin/rc
+exec /mail/lib/unspam.rc $*