Tweak output of environment logging.

1 files changed, 7 insertions, 3 deletions

diff --git a/environ.c b/environ.c
index 7709f29d..5d06afbf 100644
--- a/environ.c
+++ b/environ.c
@@ -206,10 +206,14 @@ environ_push(struct environ *env)
 
 /* Log the environment. */
 void
-environ_log(struct environ *env)
+environ_log(struct environ *env, const char *prefix)
 {
 	struct environ_entry	*envent;
 
-	RB_FOREACH(envent, environ, env)
-	    log_debug("%s=%s", envent->name, envent->value);
+	RB_FOREACH(envent, environ, env) {
+		if (envent->value != NULL && *envent->name != '\0') {
+			log_debug("%s%s=%s", prefix, envent->name,
+			    envent->value);
+		}
+	}
 }