From 17157e4aa85baea6c1503e2c95d98ed66a1596f1 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Mon, 20 Mar 2006 02:25:59 +0000
Subject: update lucida

---
 src/cmd/sam/io.c  | 4 +++-
 src/cmd/sam/sam.c | 6 +++++-
 src/cmd/sam/sam.h | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/cmd/sam')

diff --git a/src/cmd/sam/io.c b/src/cmd/sam/io.c
index 95c2e0ce..8b6f281f 100644
--- a/src/cmd/sam/io.c
+++ b/src/cmd/sam/io.c
@@ -226,7 +226,7 @@ connectto(char *machine, char **argv)
 	// count args
 	for(av = argv; *av; av++)
 		;
-	av = malloc(sizeof(char*)*((av-argv) + 5));
+	av = malloc(sizeof(char*)*((av-argv) + 10));
 	if(av == nil){
 		dprint("out of memory\n");
 		exits("fork/exec");
@@ -234,6 +234,8 @@ connectto(char *machine, char **argv)
 	ac = 0;
 	av[ac++] = RX;
 	av[ac++] = machine;
+	if(rxopt)
+		av[ac++] = rxopt;
 	av[ac++] = rsamname;
 	av[ac++] = "-R";
 	while(*argv)
diff --git a/src/cmd/sam/sam.c b/src/cmd/sam/sam.c
index 0ade9c21..01893cbb 100644
--- a/src/cmd/sam/sam.c
+++ b/src/cmd/sam/sam.c
@@ -30,6 +30,7 @@ Disk	*disk;
 long	seq;
 
 char *winsize;
+char *rxopt;
 
 Rune	baddir[] = { '<', 'b', 'a', 'd', 'd', 'i', 'r', '>', '\n'};
 
@@ -56,6 +57,9 @@ main(int volatile argc, char **volatile argv)
 	case 'R':
 		Rflag++;
 		break;
+	case 'O':
+		rxopt = EARGF(usage());
+		break;
 	case 't':
 		samterm = EARGF(usage());
 		break;
@@ -118,7 +122,7 @@ main(int volatile argc, char **volatile argv)
 void
 usage(void)
 {
-	dprint("usage: sam [-d] [-t samterm] [-s sam name] -r machine\n");
+	dprint("usage: sam [-d] [-t samterm] [-s sam name] [-r machine] [file ...]\n");
 	exits("usage");
 }
 
diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
index eefb4b34..bb88c33d 100644
--- a/src/cmd/sam/sam.h
+++ b/src/cmd/sam/sam.h
@@ -348,6 +348,7 @@ extern char	SH[];
 extern char	SHPATH[];
 extern char	RX[];
 extern char	RXPATH[];
+extern char	*rxopt;
 
 /*
  * acme globals
-- 
cgit v1.2.3