Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Break cstring->String conversion out into function

Browse source
This commit is contained in:
Steve Smith 2016-06-04 15:12:40 +01:00
parent 6179b89bcc
commit 04522760f1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ls/ls.rs
View file

@ -16,6 +16,9 @@ use pretty_bytes::converter::convert;
#[macro_use] #[macro_use]
extern crate uucore; extern crate uucore;
extern crate libc;
use self::libc::c_char;
use getopts::Options; use getopts::Options;
use std::fs; use std::fs;
use std::fs::{ReadDir, DirEntry, FileType, Metadata}; use std::fs::{ReadDir, DirEntry, FileType, Metadata};
@ -23,7 +26,7 @@ use std::ffi::{OsString,CStr};
use std::path::Path; use std::path::Path;
use std::io::Write; use std::io::Write;
use std::ptr; use std::ptr;
use uucore::c_types::getpwuid; use uucore::c_types::{getpwuid, getgrgid};
#[derive(Copy, Clone, PartialEq)] #[derive(Copy, Clone, PartialEq)]
@ -157,15 +160,16 @@ fn display_dir_entry(entry: DirEntry, options: &getopts::Matches) {
); );
} }
fn cstr2string(cstr: *const c_char) -> String {
unsafe { String::from_utf8_lossy(CStr::from_ptr(cstr).to_bytes()).to_string() }
}
fn display_uname(metadata: &Metadata) -> String { fn display_uname(metadata: &Metadata) -> String {
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
let pw = unsafe { getpwuid(metadata.uid()) }; let pw = unsafe { getpwuid(metadata.uid()) };
if !pw.is_null() { if !pw.is_null() {
let pw_name = unsafe { cstr2string(unsafe { ptr::read(pw).pw_name })
String::from_utf8_lossy(CStr::from_ptr(ptr::read(pw).pw_name).to_bytes()).to_string()
};
pw_name
} else { } else {
metadata.uid().to_string() metadata.uid().to_string()
} }
@ -173,7 +177,7 @@ fn display_uname(metadata: &Metadata) -> String {
fn display_group(metadata: &Metadata) -> String { fn display_group(metadata: &Metadata) -> String {
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
metadata.gid().to_string() metadata.uid().to_string()
} }
fn display_file_size(metadata: &Metadata, options: &getopts::Matches) -> String { fn display_file_size(metadata: &Metadata, options: &getopts::Matches) -> String {