merge

5 files changed, 7 insertions, 3 deletions

diff --git a/lib/theo b/lib/theo
index cc2474ad1..47c6045cc 100644
--- a/lib/theo
+++ b/lib/theo
@@ -927,3 +927,6 @@ No. It ends here.
 For now, no.
 I'm think you don't get it.
 I hear "me me me".
+If you guys aren't part of the solution, you are part of the precipitate.
+Nothing is perfect.
+Some users really are their own worst enemy.
diff --git a/rc/bin/newt b/rc/bin/newt
index a79a0e796..0a899bf51 100755
--- a/rc/bin/newt
+++ b/rc/bin/newt
@@ -25,7 +25,6 @@ fn e{
 	if(~ $yn y)
 		cat /tmp/post >$mnt/$group/post
 }
-fn f { du -a $* | sed 's/^.*	//g' }
 fn fmtd{
 	date=`{cat}
 	if(! ~ $date(1) [0-9]*)
@@ -96,7 +95,7 @@ fn getr{
 fn h{ sed -n $1^p /tmp/h }
 fn k{
 	kmnt=`{echo $mnt | sed 's/\//\\\//g'}
-	f $mnt/$* |
+	walk $mnt/$* |
 		grep -v -e '\/([0-9]+|article|body|header|post|xover)$' |
 		sed 's/^'$"kmnt'\//  g	/g' |
 		sort |
diff --git a/sys/games/lib/fortunes b/sys/games/lib/fortunes
index 6379f90ef..04a0f6305 100644
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -5254,3 +5254,4 @@ On the Internet, we are all Poland. -- Michael Hayden
 By the way, BBCNews site makes corrupt the browser. -- Kenji
 As much as I'd love to I feel I have to let it go -- rminnich
 You need a UNIX system to run SATAN.
+That depends on how you define native. -- Andre Garzia
diff --git a/sys/lib/mimetype b/sys/lib/mimetype
index e10298fc4..4e70fa20c 100644
--- a/sys/lib/mimetype
+++ b/sys/lib/mimetype
@@ -91,6 +91,7 @@
 .p		text		plain			-	y # Pascal program
 .p7m		application	x-pkcs7-mime		-	y # SMIME
 .p7s		application	x-pkcs7-signature	-	y # SMIME
+.patch		text		plain		-		y
 .pbm		image		x-portable-bitmap	-	y
 .pdf		application	pdf		-		y # Adobe Portable Document Format
 .pif		application	octet-stream	-		r # DOS executable
diff --git a/sys/src/cmd/upas/vf/vf.c b/sys/src/cmd/upas/vf/vf.c
index d527dc7b2..60342d247 100644
--- a/sys/src/cmd/upas/vf/vf.c
+++ b/sys/src/cmd/upas/vf/vf.c
@@ -387,7 +387,7 @@ save(Part *p, char *file)
 	Bprint(&out, "From virusfilter %τ\n", thedate(&tm));
 	writeheader(p, 0);
 	bodyoff = Boffset(&out);
-	passbody(p, 1);
+	passbody(p, 0);
 	Bprint(&out, "\n");
 	Bterm(&out);
 	close(fd);