===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tip/Attic/vars.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/tip/Attic/vars.c	2010/06/29 16:41:56	1.11
+++ src/usr.bin/tip/Attic/vars.c	2010/06/29 20:57:33	1.12
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vars.c,v 1.11 2010/06/29 16:41:56 nicm Exp $	*/
+/*	$OpenBSD: vars.c,v 1.12 2010/06/29 20:57:33 nicm Exp $	*/
 /*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
 
 /*
@@ -37,73 +37,73 @@
  * Definition of variables
  */
 value_t vtable[] = {
-	{ "beautify",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "beautify",	BOOL,			0,
 	  "be",		(char *)TRUE },
-	{ "baudrate",	NUMBER|IREMOTE|INIT,	(READ<<PUBLIC)|(WRITE<<ROOT),
+	{ "baudrate",	NUMBER|IREMOTE|INIT,	0,
 	  "ba",		(char *)&BR },
-	{ "eofread",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "eofread",	STRING|IREMOTE|INIT,	0,
 	  "eofr",	(char *)&IE },
-	{ "eofwrite",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "eofwrite",	STRING|IREMOTE|INIT,	0,
 	  "eofw",	(char *)&OE },
-	{ "eol",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "eol",	STRING|IREMOTE|INIT,	0,
 	  NULL,		(char *)&EL },
-	{ "escape",	CHAR,			(READ|WRITE)<<PUBLIC,
+	{ "escape",	CHAR,			0,
 	  "es",		(char *)'~' },
-	{ "exceptions",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
+	{ "exceptions",	STRING|INIT|IREMOTE,	0,
 	  "ex",		(char *)&EX },
-	{ "force",	CHAR,			(READ|WRITE)<<PUBLIC,
+	{ "force",	CHAR,			0,
 	  "fo",		(char *)CTRL('p') },
-	{ "framesize",	NUMBER|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "framesize",	NUMBER|IREMOTE|INIT,	0,
 	  "fr",		(char *)&FS },
-	{ "host",	STRING|IREMOTE|INIT,	READ<<PUBLIC,
+	{ "host",	STRING|IREMOTE|INIT,	READONLY,
 	  "ho",		(char *)&HO },
-	{ "log",	STRING|INIT,		(READ|WRITE)<<ROOT,
+	{ "log",	STRING|INIT,		0,
 	  NULL,		_PATH_ACULOG },
-	{ "prompt",	CHAR,			(READ|WRITE)<<PUBLIC,
+	{ "prompt",	CHAR,			0,
 	  "pr",		(char *)'\n' },
-	{ "raise",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "raise",	BOOL,			0,
 	  "ra",		(char *)FALSE },
-	{ "raisechar",	CHAR,			(READ|WRITE)<<PUBLIC,
+	{ "raisechar",	CHAR,			0,
 	  "rc",		NULL },
-	{ "record",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
+	{ "record",	STRING|INIT|IREMOTE,	0,
 	  "rec",	(char *)&RE },
-	{ "remote",	STRING|INIT|IREMOTE,	READ<<PUBLIC,
+	{ "remote",	STRING|INIT|IREMOTE,	READONLY,
 	  NULL,		(char *)&RM },
-	{ "script",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "script",	BOOL,			0,
 	  "sc",		(char *)FALSE },
-	{ "tabexpand",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "tabexpand",	BOOL,			0,
 	  "tab",	(char *)FALSE },
-	{ "verbose",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "verbose",	BOOL,			0,
 	  "verb",	(char *)TRUE },
-	{ "SHELL",	STRING|ENVIRON|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "SHELL",	STRING|ENVIRON|INIT,	0,
 	  NULL,		_PATH_BSHELL },
-	{ "HOME",	STRING|ENVIRON,		(READ|WRITE)<<PUBLIC,
+	{ "HOME",	STRING|ENVIRON,		0,
 	  NULL,		NULL },
-	{ "echocheck",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "echocheck",	BOOL,			0,
 	  "ec",		(char *)FALSE },
-	{ "disconnect",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "disconnect",	STRING|IREMOTE|INIT,	0,
 	  "di",		(char *)&DI },
-	{ "tandem",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "tandem",	BOOL,			0,
 	  "ta",		(char *)TRUE },
-	{ "linedelay",	NUMBER|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "linedelay",	NUMBER|IREMOTE|INIT,	0,
 	  "ldelay",	(char *)&DL },
-	{ "chardelay",	NUMBER|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "chardelay",	NUMBER|IREMOTE|INIT,	0,
 	  "cdelay",	(char *)&CL },
-	{ "etimeout",	NUMBER|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "etimeout",	NUMBER|IREMOTE|INIT,	0,
 	  "et",		(char *)&ET },
-	{ "rawftp",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "rawftp",	BOOL,			0,
 	  "raw",	(char *)FALSE },
-	{ "halfduplex",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "halfduplex",	BOOL,			0,
 	  "hdx",	(char *)FALSE },
-	{ "localecho",	BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "localecho",	BOOL,			0,
 	  "le",		(char *)FALSE },
-	{ "parity",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
+	{ "parity",	STRING|INIT|IREMOTE,	0,
 	  "par",	(char *)&PA },
-	{ "hardwareflow", BOOL,			(READ|WRITE)<<PUBLIC,
+	{ "hardwareflow", BOOL,			0,
 	  "hf",		(char *)FALSE },
-	{ "linedisc",	NUMBER|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
+	{ "linedisc",	NUMBER|IREMOTE|INIT,	0,
 	  "ld",		(char *)&LD },
-	{ "direct",	BOOL,			(READ<<PUBLIC)|(WRITE<<ROOT),
+	{ "direct",	BOOL,			0,
 	  "dc",		(char *)FALSE },
 	{ NULL, NULL, NULL, NULL, NULL }
 };