diff options
Diffstat (limited to 'editors/kibi/files/patch-src_unix.rs')
| -rw-r--r-- | editors/kibi/files/patch-src_unix.rs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/editors/kibi/files/patch-src_unix.rs b/editors/kibi/files/patch-src_unix.rs index 4df2a2a4e848..85ac2424b803 100644 --- a/editors/kibi/files/patch-src_unix.rs +++ b/editors/kibi/files/patch-src_unix.rs @@ -1,20 +1,11 @@ ---- src/unix.rs.orig 2020-10-06 00:22:27 UTC +--- src/unix.rs.orig 2025-11-04 01:20:03 UTC +++ src/unix.rs -@@ -45,7 +45,7 @@ fn xdg_dirs(xdg_type: &str, def_home_suffix: &str, def - } - - /// Return configuration directories for UNIX systems --pub fn conf_dirs() -> Vec<String> { xdg_dirs("CONFIG", "/.config", "/etc/xdg:/etc") } -+pub fn conf_dirs() -> Vec<String> { xdg_dirs("CONFIG", "/.config", "/etc/xdg:%%PREFIX%%/etc") } - - /// Return syntax directories for UNIX systems - pub fn data_dirs() -> Vec<String> { -@@ -59,7 +59,7 @@ pub fn data_dirs() -> Vec<String> { +@@ -29,7 +29,7 @@ pub fn get_window_size() -> Result<(usize, usize), Err /// This ioctl is described here: <http://man7.org/linux/man-pages/man4/tty_ioctl.4.html> pub fn get_window_size() -> Result<(usize, usize), Error> { let mut maybe_ws = std::mem::MaybeUninit::<winsize>::uninit(); - cerr(unsafe { libc::ioctl(STDOUT_FILENO, TIOCGWINSZ, maybe_ws.as_mut_ptr()) }) + cerr(unsafe { libc::ioctl(STDOUT_FILENO, TIOCGWINSZ.into(), maybe_ws.as_mut_ptr()) }) - .map_or(None, |_| unsafe { Some(maybe_ws.assume_init()) }) + .map_or(None, |()| unsafe { Some(maybe_ws.assume_init()) }) .filter(|ws| ws.ws_col != 0 && ws.ws_row != 0) .map_or(Err(Error::InvalidWindowSize), |ws| Ok((ws.ws_row as usize, ws.ws_col as usize))) |