barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: Force standard C locale when getting ls input for parsing in SSH (#455)

Browse source
This commit is contained in:
Anna Arad 2024-07-23 07:17:38 +03:00 • committed by GitHub
parent a6cea1a5b9
commit 71c972fbd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lua/oil/adapters/ssh/sshfs.lua
View file

@ -112,7 +112,7 @@ function SSHFS:realpath(path, callback)
abspath = abspath:sub(1, #abspath - 1) abspath = abspath:sub(1, #abspath - 1)
end end
self.conn:run( self.conn:run(
string.format("ls -land --color=never %s", shellescape(abspath)), string.format("LC_ALL=C ls -land --color=never %s", shellescape(abspath)),
function(ls_err, ls_lines) function(ls_err, ls_lines)
local type local type
if ls_err then if ls_err then
@ -142,7 +142,7 @@ function SSHFS:list_dir(url, path, callback)
if path ~= "" then if path ~= "" then
path_postfix = string.format(" %s", shellescape(path)) path_postfix = string.format(" %s", shellescape(path))
end end
self.conn:run("LANG=C ls -lan --color=never" .. path_postfix, function(err, lines) self.conn:run("LC_ALL=C ls -lan --color=never" .. path_postfix, function(err, lines)
if err then if err then
if err:match("No such file or directory%s*$") then if err:match("No such file or directory%s*$") then
-- If the directory doesn't exist, treat the list as a success. We will be able to traverse -- If the directory doesn't exist, treat the list as a success. We will be able to traverse
@ -176,7 +176,7 @@ function SSHFS:list_dir(url, path, callback)
-- If there were any soft links, then we need to run another ls command with -L so that we can -- If there were any soft links, then we need to run another ls command with -L so that we can
-- resolve the type of the link target -- resolve the type of the link target
self.conn:run( self.conn:run(
"ls -naLl --color=never" .. path_postfix .. " 2> /dev/null", "LC_ALL=C ls -naLl --color=never" .. path_postfix .. " 2> /dev/null",
function(link_err, link_lines) function(link_err, link_lines)
-- Ignore exit code 1. That just means one of the links could not be resolved. -- Ignore exit code 1. That just means one of the links could not be resolved.
if link_err and not link_err:match("^1:") then if link_err and not link_err:match("^1:") then