dovecot-2.0: lib-master: Code cleanup for master_service_env_cle...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/7cf8e3094b39
changeset: 12346:7cf8e3094b39
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Oct 25 17:22:40 2010 +0100
description:
lib-master: Code cleanup for master_service_env_clean()

diffstat:

 src/lib-master/master-service.c |  40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diffs (59 lines):

diff -r d991b5c99397 -r 7cf8e3094b39 src/lib-master/master-service.c
--- a/src/lib-master/master-service.c	Mon Oct 25 16:27:42 2010 +0100
+++ b/src/lib-master/master-service.c	Mon Oct 25 17:22:40 2010 +0100
@@ -393,32 +393,38 @@
 
 void master_service_env_clean(bool preserve_home)
 {
-	const char *user, *tz, *home;
+	static const char *preserve_envs[] = {
+		"HOME", /* keep as the first element */
+		"USER",
+		"TZ",
 #ifdef DEBUG
-	bool gdb = getenv("GDB") != NULL;
+		"GDB",
 #endif
+		NULL
+	};
+	ARRAY_TYPE(const_string) envs;
+	const char *value, *const *envp;
+	unsigned int i;
 
-	user = getenv("USER");
-	if (user != NULL)
-		user = t_strconcat("USER=", user, NULL);
-	tz = getenv("TZ");
-	if (tz != NULL)
-		tz = t_strconcat("TZ=", tz, NULL);
-	home = preserve_home ? getenv("HOME") : NULL;
-	if (home != NULL)
-		home = t_strconcat("HOME=", home, NULL);
+	t_array_init(&envs, N_ELEMENTS(preserve_envs));
+	i = preserve_home ? 0 : 1;
+	for (; preserve_envs[i] != NULL; i++) {
+		const char *key = preserve_envs[i];
+
+		value = getenv(key);
+		if (value != NULL) {
+			value = t_strconcat(key, "=", value, NULL);
+			array_append(&envs, &value, 1);
+		}
+	}
 
 	/* Note that if the original environment was set with env_put(), the
 	   environment strings will be invalid after env_clean(). That's why
 	   we t_strconcat() them above. */
 	env_clean();
 
-	if (user != NULL) env_put(user);
-	if (tz != NULL) env_put(tz);
-	if (home != NULL) env_put(home);
-#ifdef DEBUG
-	if (gdb) env_put("GDB=1");
-#endif
+	array_foreach(&envs, envp)
+		env_put(*envp);
 }
 
 void master_service_set_client_limit(struct master_service *service,