For every variable which has a value table entry with IREMOTE, remove the

remote variable and always use the value from the vtable. This then allows the
IREMOTE flag to be removed.

1 files changed, 31 insertions, 31 deletions

diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 5343694e336..96289102977 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vars.c,v 1.13 2010/06/29 21:34:50 nicm Exp $	*/
+/*	$OpenBSD: vars.c,v 1.14 2010/06/29 23:10:56 nicm Exp $	*/
 /*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
 
 /*
@@ -39,24 +39,24 @@
 value_t vtable[] = {
 	{ "beautify",	V_BOOL,
 	  "be",		(char *)1 },
-	{ "baudrate",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "ba",		(char *)&BR },
-	{ "eofread",	V_STRING|V_IREMOTE|V_INIT,
-	  "eofr",	(char *)&IE },
-	{ "eofwrite",	V_STRING|V_IREMOTE|V_INIT,
-	  "eofw",	(char *)&OE },
-	{ "eol",	V_STRING|V_IREMOTE|V_INIT,
-	  NULL,		(char *)&EL },
+	{ "baudrate",	V_NUMBER|V_INIT,
+	  "ba",		0 },
+	{ "eofread",	V_STRING|V_INIT,
+	  "eofr",	0 },
+	{ "eofwrite",	V_STRING|V_INIT,
+	  "eofw",	0 },
+	{ "eol",	V_STRING|V_INIT,
+	  NULL,		0 },
 	{ "escape",	V_CHAR,
 	  "es",		(char *)'~' },
-	{ "exceptions",	V_STRING|V_INIT|V_IREMOTE,
-	  "ex",		(char *)&EX },
+	{ "exceptions",	V_STRING|V_INIT,
+	  "ex",		0 },
 	{ "force",	V_CHAR,
 	  "fo",		(char *)CTRL('p') },
-	{ "framesize",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "fr",		(char *)&FS },
-	{ "host",	V_STRING|V_IREMOTE|V_INIT|V_READONLY,
-	  "ho",		(char *)&HO },
+	{ "framesize",	V_NUMBER|V_INIT,
+	  "fr",		0 },
+	{ "host",	V_STRING|V_INIT|V_READONLY,
+	  "ho",		0 },
 	{ "log",	V_STRING|V_INIT,
 	  NULL,		_PATH_ACULOG },
 	{ "prompt",	V_CHAR,
@@ -65,10 +65,10 @@ value_t vtable[] = {
 	  "ra",		(char *)0 },
 	{ "raisechar",	V_CHAR,
 	  "rc",		NULL },
-	{ "record",	V_STRING|V_INIT|V_IREMOTE,
-	  "rec",	(char *)&RE },
-	{ "remote",	V_STRING|V_INIT|V_IREMOTE|V_READONLY,
-	  NULL,		(char *)&RM },
+	{ "record",	V_STRING|V_INIT,
+	  "rec",	0 },
+	{ "remote",	V_STRING|V_INIT|V_READONLY,
+	  NULL,		0 },
 	{ "script",	V_BOOL,
 	  "sc",		(char *)0 },
 	{ "tabexpand",	V_BOOL,
@@ -81,28 +81,28 @@ value_t vtable[] = {
 	  NULL,		NULL },
 	{ "echocheck",	V_BOOL,
 	  "ec",		(char *)0 },
-	{ "disconnect",	V_STRING|V_IREMOTE|V_INIT,
-	  "di",		(char *)&DI },
+	{ "disconnect",	V_STRING|V_INIT,
+	  "di",		0 },
 	{ "tandem",	V_BOOL,
 	  "ta",		(char *)1 },
-	{ "linedelay",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "ldelay",	(char *)&DL },
-	{ "chardelay",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "cdelay",	(char *)&CL },
-	{ "etimeout",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "et",		(char *)&ET },
+	{ "linedelay",	V_NUMBER|V_INIT,
+	  "ldelay",	0 },
+	{ "chardelay",	V_NUMBER|V_INIT,
+	  "cdelay",	0 },
+	{ "etimeout",	V_NUMBER|V_INIT,
+	  "et",		0 },
 	{ "rawftp",	V_BOOL,
 	  "raw",	(char *)0 },
 	{ "halfduplex",	V_BOOL,
 	  "hdx",	(char *)0 },
 	{ "localecho",	V_BOOL,
 	  "le",		(char *)0 },
-	{ "parity",	V_STRING|V_INIT|V_IREMOTE,
-	  "par",	(char *)&PA },
+	{ "parity",	V_STRING|V_INIT,
+	  "par",	0 },
 	{ "hardwareflow", V_BOOL,
 	  "hf",		(char *)0 },
-	{ "linedisc",	V_NUMBER|V_IREMOTE|V_INIT,
-	  "ld",		(char *)&LD },
+	{ "linedisc",	V_NUMBER|V_INIT,
+	  "ld",		0 },
 	{ "direct",	V_BOOL,
 	  "dc",		(char *)0 },
 	{ NULL,         0,