39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 66ba6cf93bdeb063fdc8006a0eeaa22cd1fa3f39 Mon Sep 17 00:00:00 2001
|
|
From: Mark Nudelman <markn@greenwoodsoftware.com>
|
|
Date: Sat, 8 Oct 2022 21:10:15 -0700
|
|
Subject: [PATCH 03/48] Fix bug in setting env vars from lt file in test mode.
|
|
|
|
---
|
|
lesstest/env.c | 15 +++++++--------
|
|
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/lesstest/env.c b/lesstest/env.c
|
|
index 8670a52..d1a570b 100644
|
|
--- a/lesstest/env.c
|
|
+++ b/lesstest/env.c
|
|
@@ -87,14 +87,13 @@ static void env_setup(EnvBuf* env, char* const* prog_env, int interactive) {
|
|
env_addpair(env, "LESS_TERMCAP_kh", terminfo.key_home ? terminfo.key_home : "");
|
|
env_addpair(env, "LESS_TERMCAP_@7", terminfo.key_end ? terminfo.key_end : "");
|
|
|
|
- if (interactive) {
|
|
- for (char* const* envp = prog_env; *envp != NULL; ++envp) {
|
|
- const char* ename = *envp;
|
|
- const char* eq = strchr(ename, '=');
|
|
- if (eq != NULL && is_less_env(ename, eq-ename)) {
|
|
- env_addlpair(env, ename, eq-ename, eq+1);
|
|
- log_env(ename, eq-ename, eq+1);
|
|
- }
|
|
+ for (char* const* envp = prog_env; *envp != NULL; ++envp) {
|
|
+ const char* ename = *envp;
|
|
+ const char* eq = strchr(ename, '=');
|
|
+ if (eq == NULL) continue;
|
|
+ if (!interactive || is_less_env(ename, eq-ename)) {
|
|
+ env_addlpair(env, ename, eq-ename, eq+1);
|
|
+ log_env(ename, eq-ename, eq+1);
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.27.0
|
|
|