mrsh: mrsh_populate_env: unset COLUMNS v2 PROPOSED

Drew DeVault: 1
 mrsh_populate_env: unset COLUMNS

 1 files changed, 5 insertions(+), 0 deletions(-)

[PATCH mrsh v2] mrsh_populate_env: unset COLUMNS Export this patch

This fixes the ls problem
---
 shell/entry.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/entry.c b/shell/entry.c
index 80dcbea..62377ba 100644
--- a/shell/entry.c
+++ b/shell/entry.c
@@ -111,6 +111,11 @@ bool mrsh_populate_env(struct mrsh_state *state, char **environ) {
 	}
 
 	mrsh_env_set(state, "OPTIND", "1", MRSH_VAR_ATTRIB_NONE);
+
+	/* POSIX 8.3: If this variable is unset or null, the implementation
+	 * determines the number of columns */
+	mrsh_env_unset(state, "LINES");
+	mrsh_env_unset(state, "COLUMNS");
 	return true;
 }
 
-- 
2.27.0

builds.sr.ht <builds@sr.ht>

4 years ago

mrsh/patches/alpine.yml #254151: SUCCESS in 31s

[mrsh_populate_env: unset COLUMNS][0] v2 from [Drew DeVault][1]

[0]: https://lists.sr.ht/~emersion/mrsh-dev/patches/11599
[1]: mailto:sir@cmpwn.com

https://builds.sr.ht/~emersion/job/254151

✓ _apply_patch ✓ setup ✓ build-gcc ✓ build-clang ✓ test-gcc ✓ test-clang

builds.sr.ht <builds@sr.ht>

4 years ago

mrsh/patches/annotate.yml #254152: FAILED in 36s

[mrsh_populate_env: unset COLUMNS][0] v2 from [Drew DeVault][1]

[0]: https://lists.sr.ht/~emersion/mrsh-dev/patches/11599
[1]: mailto:sir@cmpwn.com

https://builds.sr.ht/~emersion/job/254152

✓ _apply_patch ✓ annotatesh ✗ upload

builds.sr.ht <builds@sr.ht>

4 years ago

mrsh/patches/freebsd.yml #254154: SUCCESS in 1m10s

[mrsh_populate_env: unset COLUMNS][0] v2 from [Drew DeVault][1]

[0]: https://lists.sr.ht/~emersion/mrsh-dev/patches/11599
[1]: mailto:sir@cmpwn.com

https://builds.sr.ht/~emersion/job/254154

✓ _apply_patch ✓ setup ✓ build ✓ test

builds.sr.ht <builds@sr.ht>

4 years ago

mrsh/patches/archlinux.yml #254153: FAILED in 25s

[mrsh_populate_env: unset COLUMNS][0] v2 from [Drew DeVault][1]

[0]: https://lists.sr.ht/~emersion/mrsh-dev/patches/11599
[1]: mailto:sir@cmpwn.com

https://builds.sr.ht/~emersion/job/254153

✓ _apply_patch ✓ setup ✓ build ✓ test ✗ build-release - build-minimal