YAMF22

1 files changed, 30 insertions, 14 deletions

diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index cafcaa0..3f76977 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id$
+ * $Id: dmenu.c,v 1.32 1997/02/22 14:11:35 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -174,26 +174,42 @@ dmenuFlagCheck(dialogMenuItem *item)
 int
 dmenuVarCheck(dialogMenuItem *item)
 {
-    char *w, *cp, *cp2, *cp3, tmp[256];
+    char *w;
 
     w = (char *)item->aux;
     if (!w)
 	w = (char *)item->data;
     if (!w)
 	return FALSE;
-    SAFE_STRCPY(tmp, w);
-    if ((cp = index(tmp, '=')) != NULL) {
-        *(cp++) = '\0';
-	if ((cp3 = index(cp, ',')) != NULL)
-	    *cp3 = '\0';
-        cp2 = getenv(tmp);
-        if (cp2)
-            return !strcmp(cp, cp2);
-        else
-            return FALSE;
+    return variable_check(w);
+}
+
+int
+dmenuVarsCheck(dialogMenuItem *item)
+{
+    int res, init;
+    char *w, *cp1, *cp2;
+    char *copy;
+
+    w = (char *)item->aux;
+    if (!w)
+	w = (char *)item->data;
+    if (!w)
+	return FALSE;
+    
+    copy = strdup(w);
+    res = TRUE;
+    init = FALSE;
+    for (cp1 = copy; cp1 != NULL;) {
+        init = TRUE;
+	cp2 = index(cp1, ',');
+	if (cp2 != NULL)
+	    *cp2++ = '\0';
+	res = res && variable_check(cp1);
+	cp1 = cp2;
     }
-    else
-        return (int)getenv(tmp);
+    free(copy);
+    return res && init;
 }
 
 int