--- src/usr.bin/tip/tip/vars.c	2003/06/17 04:29:33	1.2
+++ src/usr.bin/tip/tip/vars.c	2005/04/19 05:32:02	1.3
@@ -32,7 +32,7 @@
  *
  * @(#)vars.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/tip/tip/vars.c,v 1.4 1999/08/28 01:06:36 peter Exp $
- * $DragonFly: src/usr.bin/tip/tip/vars.c,v 1.1 2003/06/16 07:10:22 dillon Exp $
+ * $DragonFly$
  */
 
 #include "tipconf.h"
@@ -54,7 +54,7 @@ value_t vtable[] = {
 	{ "eofwrite",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
 	  "eofw",	(char *)&OE },
 	{ "eol",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
-	  NOSTR,	(char *)&EL },
+	  NULL,		(char *)&EL },
 	{ "escape",	CHAR,			(READ|WRITE)<<PUBLIC,
 	  "es",		(char *)'~' },
 	{ "exceptions",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
@@ -66,13 +66,13 @@ value_t vtable[] = {
 	{ "host",	STRING|IREMOTE|INIT,	READ<<PUBLIC,
 	  "ho",		(char *)&HO },
 	{ "log",	STRING|INIT,		(READ|WRITE)<<ROOT,
-	  NOSTR,	_PATH_ACULOG },
+	  NULL,		_PATH_ACULOG },
 	{ "login",	STRING|IREMOTE|INIT,		(READ|WRITE)<<PUBLIC,
 	  "li",	(char *)&LI },
 	{ "logout",	STRING|IREMOTE|INIT,		(READ|WRITE)<<PUBLIC,
 	  "lo",	(char *)&LO },
 	{ "phones",	STRING|INIT|IREMOTE,	READ<<PUBLIC,
-	  NOSTR,	(char *)&PH },
+	  NULL,		(char *)&PH },
 	{ "prompt",	CHAR,			(READ|WRITE)<<PUBLIC,
 	  "pr",		(char *)'\n' },
 	{ "raise",	BOOL,			(READ|WRITE)<<PUBLIC,
@@ -82,7 +82,7 @@ value_t vtable[] = {
 	{ "record",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
 	  "rec",	(char *)&RE },
 	{ "remote",	STRING|INIT|IREMOTE,	READ<<PUBLIC,
-	  NOSTR,	(char *)&RM },
+	  NULL,		(char *)&RM },
 	{ "script",	BOOL,			(READ|WRITE)<<PUBLIC,
 	  "sc",		(char *)FALSE },
 	{ "tabexpand",	BOOL,			(READ|WRITE)<<PUBLIC,
@@ -92,7 +92,7 @@ value_t vtable[] = {
 	{ "SHELL",	STRING|ENVIRON|INIT,	(READ|WRITE)<<PUBLIC,
 	  NULL,		_PATH_BSHELL },
 	{ "HOME",	STRING|ENVIRON,		(READ|WRITE)<<PUBLIC,
-	  NOSTR,	NOSTR },
+	  NULL,		NULL },
 	{ "echocheck",	BOOL,			(READ|WRITE)<<PUBLIC,
 	  "ec",		(char *)FALSE },
 	{ "disconnect",	STRING|IREMOTE|INIT,	(READ|WRITE)<<PUBLIC,
@@ -113,5 +113,5 @@ value_t vtable[] = {
 	  "le",		(char *)FALSE },
 	{ "parity",	STRING|INIT|IREMOTE,	(READ|WRITE)<<PUBLIC,
 	  "par",	(char *)&PA },
-	{ NOSTR, 0, 0, NOSTR, NOSTR }
+	{ NULL, 0, 0, NULL, NULL }
 };