Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lua/oil/adapters/ssh/sshfs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function SSHFS:realpath(path, callback)
abspath = abspath:sub(1, #abspath - 1)
end
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)
local type
if ls_err then
Expand Down Expand Up @@ -142,7 +142,7 @@ function SSHFS:list_dir(url, path, callback)
if path ~= "" then
path_postfix = string.format(" %s", shellescape(path))
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: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
Expand Down Expand Up @@ -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
-- resolve the type of the link target
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)
-- 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
Expand Down