better spam (Lou Kamenov)

src/cmd/upas/bayes/hash.c

diff --git a/src/cmd/upas/bayes/hash.c b/src/cmd/upas/bayes/hash.c
index 1d0d0ac..0d21a55 100644
--- a/src/cmd/upas/bayes/hash.c
+++ b/src/cmd/upas/bayes/hash.c
@@ -3,6 +3,8 @@
 #include <bio.h>
 #include "hash.h"
 
+#define mergesort bayesmergesort
+
 /***
  * String hash tables.
  */

src/cmd/upas/ned/nedmail.c

diff --git a/src/cmd/upas/ned/nedmail.c b/src/cmd/upas/ned/nedmail.c
index 193d8f2..a3a251b 100644
--- a/src/cmd/upas/ned/nedmail.c
+++ b/src/cmd/upas/ned/nedmail.c
@@ -5,6 +5,7 @@
 #include <thread.h>
 
 #define system nedsystem
+#define rcmd nedrcmd
 
 typedef struct Message Message;
 typedef struct Ctype Ctype;

src/cmd/upas/nfs/main.c

diff --git a/src/cmd/upas/nfs/main.c b/src/cmd/upas/nfs/main.c
index aa37d8b..cd644db 100644
--- a/src/cmd/upas/nfs/main.c
+++ b/src/cmd/upas/nfs/main.c
@@ -22,16 +22,17 @@
 void
 usage(void)
 {
-	fprint(2, "usage: mailfs [-t] server\n");
+	fprint(2, "usage: mailfs [-DVtx] [-s srvname] server\n");
 	threadexitsall("usage");
 }
 
 void
 threadmain(int argc, char **argv)
 {
-	char *server;
+	char *server, *srvname;
 	int mode;
 
+	srvname = "mail";
 	mode = Unencrypted;
 	ARGBEGIN{
 	default:
@@ -42,6 +43,9 @@
 	case 'V':
 		chattyimap++;
 		break;
+	case 's':
+		srvname = EARGF(usage());
+		break;
 	case 't':
 		mode = Tls;
 		break;
@@ -63,6 +67,6 @@
 
 	if((imap = imapconnect(server, mode)) == nil)
 		sysfatal("imapconnect: %r");
-	threadpostmountsrv(&fs, "mail", nil, 0);
+	threadpostmountsrv(&fs, srvname, nil, 0);
 }