tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

depend on proxmox 0.1.13, use new tty helpers from there

Browse Source
This commit is contained in:
Dietmar Maurer
2020-01-31 08:16:00 +01:00
parent f0188322ed
commit 501f4fa220
6 changed files with 20 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/backup/catalog_shell.rs
View File

@ -7,11 +7,13 @@ use std::path::Path;
use failure::*;
use proxmox::api::{cli::*, *};
use proxmox::sys::linux::tty;
use super::catalog::{CatalogReader, DirEntry};
use crate::pxar::*;
use crate::tools;
use proxmox::api::{cli::*, *};
const PROMPT_PREFIX: &str = "pxar:";
const PROMPT: &str = ">";
@ -266,7 +268,7 @@ fn ls_command(path: Option<String>) -> Result<(), Error> {
None => 0,
};
let (_rows, mut cols) = Context::get_terminal_size();
let (_rows, mut cols) = tty::stdout_terminal_size();
cols /= max;
let mut out = std::io::stdout();
@ -651,31 +653,6 @@ impl Context {
Ok(prompt)
}
/// Get the current size of the terminal
/// # Safety
///
/// uses unsafe call to tty_ioctl, see man tty_ioctl(2)
fn get_terminal_size() -> (usize, usize) {
const TIOCGWINSZ: libc::c_ulong = 0x5413;
#[repr(C)]
struct WinSize {
ws_row: libc::c_ushort,
ws_col: libc::c_ushort,
_ws_xpixel: libc::c_ushort, // unused
_ws_ypixel: libc::c_ushort, // unused
}
let mut winsize = WinSize {
ws_row: 0,
ws_col: 0,
_ws_xpixel: 0,
_ws_ypixel: 0,
};
unsafe { libc::ioctl(libc::STDOUT_FILENO, TIOCGWINSZ, &mut winsize) };
(winsize.ws_row as usize, winsize.ws_col as usize)
}
/// Look up the entry given by a canonical absolute `path` in the archive.
///
/// This will actively navigate the archive by calling the corresponding