maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

to_string_lossy().to_string() for users/groups

Browse source
This commit is contained in:
ChristianVisintin 2020-11-29 15:56:01 +01:00
parent badbddb240
commit 1ff42ecf13
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/fs/mod.rs
View file

@ -151,7 +151,7 @@ impl std::fmt::Display for FsEntry {
// Get username // Get username
let username: String = match dir.user { let username: String = match dir.user {
Some(uid) => match get_user_by_uid(uid) { Some(uid) => match get_user_by_uid(uid) {
Some(user) => user.name(), Some(user) => user.name().to_string_lossy().to_string(),
None => uid.to_string(), None => uid.to_string(),
}, },
None => String::from("0"), None => String::from("0"),
@ -159,7 +159,7 @@ impl std::fmt::Display for FsEntry {
// Get group // Get group
let group: String = match dir.group { let group: String = match dir.group {
Some(gid) => match get_group_by_gid(gid) { Some(gid) => match get_group_by_gid(gid) {
Some(group) => group.name(), Some(group) => group.name().to_string_lossy().to_string(),
None => gid.to_string(), None => gid.to_string(),
}, },
None => String::from("0"), None => String::from("0"),
@ -240,7 +240,7 @@ impl std::fmt::Display for FsEntry {
// Get username // Get username
let username: String = match file.user { let username: String = match file.user {
Some(uid) => match get_user_by_uid(uid) { Some(uid) => match get_user_by_uid(uid) {
Some(user) => user.name(), Some(user) => user.name().to_string_lossy().to_string(),
None => uid.to_string(), None => uid.to_string(),
}, },
None => String::from("0"), None => String::from("0"),
@ -248,7 +248,7 @@ impl std::fmt::Display for FsEntry {
// Get group // Get group
let group: String = match file.group { let group: String = match file.group {
Some(gid) => match get_group_by_gid(gid) { Some(gid) => match get_group_by_gid(gid) {
Some(group) => group.name(), Some(group) => group.name().to_string_lossy().to_string(),
None => gid.to_string(), None => gid.to_string(),
}, },
None => String::from("0"), None => String::from("0"),