diff --git a/Cargo.lock b/Cargo.lock index 1ae01cd4f6ca2172ae2b0795477bea8ce03b39ec..41a6d11b727f9c0c82386a0d590558178498cd87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,6 +351,7 @@ dependencies = [ "redox_syscall 0.3.2", "sc", "spin 0.9.4", + "unicode-width", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3f163c02a2d49d1f3540be18a81d61991a503929..f4e172353c83c3b90bb483b7570e8ca44283b0e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ posix-regex = { path = "posix-regex", features = ["no_std"] } rand = { version = "0.5.5", default-features = false } memchr = { version = "2.2.0", default-features = false } plain = "0.2" +unicode-width = "0.1" [dependencies.goblin] version = "0.0.21" diff --git a/src/header/wchar/mod.rs b/src/header/wchar/mod.rs index cde6a5e85bbaccabe79fd808e5b5e7828bbc8f3a..93096dad9ab31b53ff26b7b4b1664d83cfc6024e 100644 --- a/src/header/wchar/mod.rs +++ b/src/header/wchar/mod.rs @@ -656,9 +656,15 @@ pub extern "C" fn wctob(c: wint_t) -> c_int { } } -// #[no_mangle] +#[no_mangle] pub extern "C" fn wcwidth(wc: wchar_t) -> c_int { - unimplemented!(); + match char::from_u32(wc as u32) { + Some(c) => match unicode_width::UnicodeWidthChar::width(c) { + Some(width) => width as c_int, + None => -1, + }, + None => -1, + } } #[no_mangle]