From 09b58bbc77a702bb5deb2f5c3deb8d9a6ebb59cc Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sun, 15 Mar 1998 17:10:17 +0000
Subject: Reformatting, more sanity checks.

---
 usr.sbin/sysinstall/variable.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'usr.sbin/sysinstall/variable.c')

diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c
index c5fcc27888273..610fb3de31873 100644
--- a/usr.sbin/sysinstall/variable.c
+++ b/usr.sbin/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: variable.c,v 1.21 1997/10/12 16:21:21 jkh Exp $
+ * $Id: variable.c,v 1.22 1998/03/10 17:24:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -183,15 +183,18 @@ variable_check(char *data)
 	    if ((cp3 = index(cp, '"')) != NULL)
 		*cp3 = '\0';
 	}
-	if ((cp3 = index(cp, ',')) != NULL)
+	else if ((cp3 = index(cp, ',')) != NULL)
 	    *cp3 = '\0';
         cp2 = getenv(tmp);
-
-        if (cp2)
-            return !strcmp(cp, cp2);
+        if (cp2) {
+	    if (!*cp)
+		return TRUE;
+	    else
+        	return !strcmp(cp, cp2);
+	}
         else
             return FALSE;
     }
     else
-        return getenv(tmp) ? 1 : 0;
+        return getenv(tmp) ? TRUE : FALSE;
 } 
-- 
cgit v1.3