From c378564e923e328eb04a88d4f040cdd18cf26495 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Mon, 16 Aug 2010 19:48:03 +0000
Subject: [PATCH] * edit_value(): if no environment variable specified, use ""
 * set_str_val(): don't check NULL here, expect it to be non-null.

---
 citadel/utils/setup.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 011351191..f69f52beb 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -842,13 +842,10 @@ void set_bool_val(int msgpos, int *ip, char *DefValue)
 
 void set_str_val(int msgpos, char *Target, char *DefValue) 
 {
-	if (DefValue != NULL)
-	{
-		strprompt(setup_titles[msgpos], 
-			  setup_text[msgpos], 
-			  Target, 
-			  DefValue);
-	}
+	strprompt(setup_titles[msgpos], 
+		  setup_text[msgpos], 
+		  Target, 
+		  DefValue);
 }
 
 void set_int_val(int msgpos, int *ip, char *DefValue)
@@ -889,6 +886,8 @@ void edit_value(int curr)
 	{
 		Value = getenv(EnvNames[curr]);
 	}
+	if (Value == NULL)
+		Value = "";
 
 
 	switch (curr) {
-- 
2.30.2