aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-04-07 13:42:20 +0200
committerKim Alvefur <zash@zash.se>2023-04-07 13:42:20 +0200
commit9760019a25dbbb6e04d4ee1ee1366ea14fc0472e (patch)
treeb2a951151b92156055430bd602e7d1f00922d3d7
parentd73eaf9e5e6c49fff6262ce326bf193108f45695 (diff)
downloadprosody-9760019a25dbbb6e04d4ee1ee1366ea14fc0472e.tar.gz
prosody-9760019a25dbbb6e04d4ee1ee1366ea14fc0472e.zip
util.human.io: Prefer using the $COLUMNS environment variable if set (by readline)
Feels like it should be faster.
-rw-r--r--util/human/io.lua2
-rw-r--r--util/prosodyctl/shell.lua2
2 files changed, 3 insertions, 1 deletions
diff --git a/util/human/io.lua b/util/human/io.lua
index 51a95ed5..e4bea63f 100644
--- a/util/human/io.lua
+++ b/util/human/io.lua
@@ -109,6 +109,8 @@ if utf8.len and utf8.offset then
end
local function term_width(default)
+ local env_cols = os.getenv "COLUMNS";
+ if env_cols then return env_cols; end
local stty = io.popen("stty -a");
if not stty then return default; end
local result = stty:read("*a");
diff --git a/util/prosodyctl/shell.lua b/util/prosodyctl/shell.lua
index ed102d47..442ea2bd 100644
--- a/util/prosodyctl/shell.lua
+++ b/util/prosodyctl/shell.lua
@@ -30,7 +30,7 @@ local function read_line(prompt_string)
end
local function send_line(client, line)
- client.send(st.stanza("repl-input", { width = os.getenv "COLUMNS" or term_width() }):text(line));
+ client.send(st.stanza("repl-input", { width = term_width() }):text(line));
end
local function repl(client)