RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-31 13:07:46 +00:00
Code Issues Activity

Fix deprecation warnings

Browse source
This commit is contained in:
Michael Gehring 2014-07-29 08:52:58 +02:00
parent b3aeebb344
commit ac77c6da17
11 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/chroot/chroot.rs
View file

@ -194,7 +194,7 @@ fn set_user(user: &str) {
fn strerror(errno: i32) -> String { fn strerror(errno: i32) -> String {
unsafe { unsafe {
let err = libc::funcs::c95::string::strerror(errno); let err = libc::funcs::c95::string::strerror(errno);
std::str::raw::from_c_str(err as *const i8) std::string::raw::from_buf(err as *const u8)
} }
} }

4
src/common/c_types.rs
View file

@ -15,7 +15,7 @@ use std::vec::Vec;
use std::os; use std::os;
use std::ptr::{mut_null, read}; use std::ptr::{mut_null, read};
use std::str::raw::from_c_str; use std::string::raw::from_buf;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub struct c_passwd { pub struct c_passwd {
@ -207,7 +207,7 @@ pub fn group(possible_pw: Option<c_passwd>, nflag: bool) {
let group = unsafe { getgrgid(g) }; let group = unsafe { getgrgid(g) };
if group.is_not_null() { if group.is_not_null() {
let name = unsafe { let name = unsafe {
from_c_str(read(group).gr_name) from_buf(read(group).gr_name as *const u8)
}; };
print!("{:s} ", name); print!("{:s} ", name);
} }

38
src/id/id.rs
View file

@ -25,7 +25,7 @@ use libc::{
getuid getuid
}; };
use libc::funcs::posix88::unistd::{getegid, geteuid, getlogin}; use libc::funcs::posix88::unistd::{getegid, geteuid, getlogin};
use std::str::raw::from_c_str; use std::string::raw::from_buf;
use getopts::{getopts, optflag, usage}; use getopts::{getopts, optflag, usage};
use c_types::{ use c_types::{
c_passwd, c_passwd,
@ -136,7 +136,7 @@ pub fn uumain(args: Vec<String>) -> int {
let gr = unsafe { getgrgid(id) }; let gr = unsafe { getgrgid(id) };
if nflag && gr.is_not_null() { if nflag && gr.is_not_null() {
let gr_name = unsafe { from_c_str(read(gr).gr_name) }; let gr_name = unsafe { from_buf(read(gr).gr_name as *const u8) };
println!("{:s}", gr_name); println!("{:s}", gr_name);
} else { } else {
println!("{:u}", id); println!("{:u}", id);
@ -156,7 +156,7 @@ pub fn uumain(args: Vec<String>) -> int {
let pw = unsafe { getpwuid(id) }; let pw = unsafe { getpwuid(id) };
if nflag && pw.is_not_null() { if nflag && pw.is_not_null() {
let pw_name = unsafe { let pw_name = unsafe {
from_c_str(read(pw).pw_name) from_buf(read(pw).pw_name as *const u8)
}; };
println!("{:s}", pw_name); println!("{:s}", pw_name);
} else { } else {
@ -194,16 +194,16 @@ fn pretty(possible_pw: Option<c_passwd>) {
if possible_pw.is_some() { if possible_pw.is_some() {
let pw = possible_pw.unwrap(); let pw = possible_pw.unwrap();
let pw_name = unsafe { from_c_str(pw.pw_name) }; let pw_name = unsafe { from_buf(pw.pw_name as *const u8) };
print!("uid\t{:s}\ngroups\t", pw_name); print!("uid\t{:s}\ngroups\t", pw_name);
group(possible_pw, true); group(possible_pw, true);
} else { } else {
let login = unsafe { from_c_str(getlogin() as *const i8) }; let login = unsafe { from_buf(getlogin() as *const u8) };
let rid = unsafe { getuid() }; let rid = unsafe { getuid() };
let pw = unsafe { getpwuid(rid) }; let pw = unsafe { getpwuid(rid) };
let is_same_user = unsafe { let is_same_user = unsafe {
from_c_str(read(pw).pw_name) == login from_buf(read(pw).pw_name as *const u8) == login
}; };
if pw.is_null() || is_same_user { if pw.is_null() || is_same_user {
@ -213,7 +213,7 @@ fn pretty(possible_pw: Option<c_passwd>) {
if pw.is_not_null() { if pw.is_not_null() {
println!( println!(
"uid\t{:s}", "uid\t{:s}",
unsafe { from_c_str(read(pw).pw_name) }) unsafe { from_buf(read(pw).pw_name as *const u8) })
} else { } else {
println!("uid\t{:u}\n", rid); println!("uid\t{:u}\n", rid);
} }
@ -224,7 +224,7 @@ fn pretty(possible_pw: Option<c_passwd>) {
if pw.is_not_null() { if pw.is_not_null() {
println!( println!(
"euid\t{:s}", "euid\t{:s}",
unsafe { from_c_str(read(pw).pw_name) }); unsafe { from_buf(read(pw).pw_name as *const u8) });
} else { } else {
println!("euid\t{:u}", eid); println!("euid\t{:u}", eid);
} }
@ -237,7 +237,7 @@ fn pretty(possible_pw: Option<c_passwd>) {
if gr.is_not_null() { if gr.is_not_null() {
println!( println!(
"rgid\t{:s}", "rgid\t{:s}",
unsafe { from_c_str(read(gr).gr_name) }); unsafe { from_buf(read(gr).gr_name as *const u8) });
} else { } else {
println!("rgid\t{:u}", rid); println!("rgid\t{:u}", rid);
} }
@ -285,11 +285,11 @@ fn pline(possible_pw: Option<c_passwd>) {
possible_pw.unwrap() possible_pw.unwrap()
}; };
let pw_name = unsafe { from_c_str(pw.pw_name) }; let pw_name = unsafe { from_buf(pw.pw_name as *const u8)};
let pw_passwd = unsafe { from_c_str(pw.pw_passwd)}; let pw_passwd = unsafe { from_buf(pw.pw_passwd as *const u8)};
let pw_gecos = unsafe { from_c_str(pw.pw_gecos) }; let pw_gecos = unsafe { from_buf(pw.pw_gecos as *const u8)};
let pw_dir = unsafe { from_c_str(pw.pw_dir) }; let pw_dir = unsafe { from_buf(pw.pw_dir as *const u8)};
let pw_shell = unsafe { from_c_str(pw.pw_shell) }; let pw_shell = unsafe { from_buf(pw.pw_shell as *const u8)};
println!( println!(
"{:s}:{:s}:{:u}:{:u}:{:s}:{:s}:{:s}", "{:s}:{:s}:{:u}:{:u}:{:s}:{:s}:{:s}",
@ -349,7 +349,7 @@ fn id_print(possible_pw: Option<c_passwd>,
print!( print!(
"uid={:u}({:s})", "uid={:u}({:s})",
uid, uid,
unsafe { from_c_str(possible_pw.unwrap().pw_name) }); unsafe { from_buf(possible_pw.unwrap().pw_name as *const u8) });
} else { } else {
print!("uid={:u}", unsafe { getuid() }); print!("uid={:u}", unsafe { getuid() });
} }
@ -359,7 +359,7 @@ fn id_print(possible_pw: Option<c_passwd>,
if gr.is_not_null() { if gr.is_not_null() {
print!( print!(
"({:s})", "({:s})",
unsafe { from_c_str(read(gr).gr_name) }); unsafe { from_buf(read(gr).gr_name as *const u8) });
} }
let euid = unsafe { geteuid() }; let euid = unsafe { geteuid() };
@ -369,7 +369,7 @@ fn id_print(possible_pw: Option<c_passwd>,
if pw.is_not_null() { if pw.is_not_null() {
print!( print!(
"({:s})", "({:s})",
unsafe { from_c_str(read(pw).pw_name) }); unsafe { from_buf(read(pw).pw_name as *const u8) });
} }
} }
@ -379,7 +379,7 @@ fn id_print(possible_pw: Option<c_passwd>,
unsafe { unsafe {
let grp = getgrgid(egid); let grp = getgrgid(egid);
if grp.is_not_null() { if grp.is_not_null() {
print!("({:s})", from_c_str(read(grp).gr_name)); print!("({:s})", from_buf(read(grp).gr_name as *const u8));
} }
} }
} }
@ -394,7 +394,7 @@ fn id_print(possible_pw: Option<c_passwd>,
let group = unsafe { getgrgid(gr) }; let group = unsafe { getgrgid(gr) };
if group.is_not_null() { if group.is_not_null() {
let name = unsafe { let name = unsafe {
from_c_str(read(group).gr_name) from_buf(read(group).gr_name as *const u8)
}; };
print!("({:s})", name); print!("({:s})", name);
} }

4
src/logname/logname.rs
View file

@ -19,7 +19,7 @@ extern crate getopts;
extern crate libc; extern crate libc;
use std::io::print; use std::io::print;
use std::str; use std::string;
use libc::c_char; use libc::c_char;
#[path = "../common/util.rs"] mod util; #[path = "../common/util.rs"] mod util;
@ -32,7 +32,7 @@ extern {
unsafe fn get_userlogin() -> String { unsafe fn get_userlogin() -> String {
let login: *const libc::c_char = getlogin(); let login: *const libc::c_char = getlogin();
str::raw::from_c_str(login) string::raw::from_buf(login as *const u8)
} }
static NAME: &'static str = "logname"; static NAME: &'static str = "logname";

2
src/tail/tail.rs
View file

@ -158,7 +158,7 @@ fn tail<T: Reader> (reader: &mut BufferedReader<T>, line_count:uint, follow:bool
if line_count<=ringbuf.len(){ if line_count<=ringbuf.len(){
ringbuf.pop_front(); ringbuf.pop_front();
} }
ringbuf.push_back(line); ringbuf.push(line);
} }
Err(err) => fail!(err) Err(err) => fail!(err)
} }

2
src/tsort/tsort.rs
View file

@ -160,7 +160,7 @@ impl Graph {
} }
while !start_nodes.is_empty() { while !start_nodes.is_empty() {
let n = start_nodes.shift().unwrap(); let n = start_nodes.remove(0).unwrap();
self.result.push(n.clone()); self.result.push(n.clone());

4
src/tty/tty.rs
View file

@ -19,7 +19,7 @@
extern crate getopts; extern crate getopts;
extern crate libc; extern crate libc;
use std::str; use std::string;
use std::io::println; use std::io::println;
use std::io::stdio::stderr; use std::io::stdio::stderr;
use getopts::{optflag,getopts}; use getopts::{optflag,getopts};
@ -50,7 +50,7 @@ pub fn uumain(args: Vec<String>) -> int {
} }
}; };
let tty = unsafe { str::raw::from_c_str(ttyname(libc::STDIN_FILENO)) }; let tty = unsafe { string::raw::from_buf(ttyname(libc::STDIN_FILENO) as *const u8) };
if !silent { if !silent {
if !tty.as_slice().is_whitespace() { if !tty.as_slice().is_whitespace() {

10
src/uname/uname.rs
View file

@ -19,7 +19,7 @@ extern crate libc;
use std::mem::uninitialized; use std::mem::uninitialized;
use std::io::print; use std::io::print;
use std::str::raw::from_c_str; use std::string::raw::from_buf;
use c_types::utsname; use c_types::utsname;
#[path = "../common/util.rs"] mod util; #[path = "../common/util.rs"] mod util;
@ -41,9 +41,11 @@ unsafe fn getuname() -> utsrust {
let mut uts: utsname = uninitialized(); let mut uts: utsname = uninitialized();
uname(&mut uts); uname(&mut uts);
utsrust { utsrust {
sysname: from_c_str(uts.sysname.as_ptr()), nodename: from_c_str(uts.nodename.as_ptr()), sysname: from_buf(uts.sysname.as_ptr() as *const u8),
release: from_c_str(uts.release.as_ptr()), version: from_c_str(uts.version.as_ptr()), nodename: from_buf(uts.nodename.as_ptr() as *const u8),
machine: from_c_str(uts.machine.as_ptr()) release: from_buf(uts.release.as_ptr() as *const u8),
version: from_buf(uts.version.as_ptr() as *const u8),
machine: from_buf(uts.machine.as_ptr() as *const u8)
} }
} }

4
src/users/users.rs
View file

@ -22,7 +22,7 @@ extern crate libc;
use std::io::print; use std::io::print;
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use std::str; use std::string;
use utmpx::*; use utmpx::*;
#[path = "../common/util.rs"] #[path = "../common/util.rs"]
@ -103,7 +103,7 @@ fn exec(filename: &str) {
} }
if (*line).ut_type == USER_PROCESS { if (*line).ut_type == USER_PROCESS {
let user = str::raw::from_c_str(mem::transmute(&(*line).ut_user)); let user = string::raw::from_buf(mem::transmute(&(*line).ut_user));
users.push(user); users.push(user);
} }
} }

2
src/uutils/uutils.rs
View file

@ -67,7 +67,7 @@ fn main() {
// try first arg as util name. // try first arg as util name.
if args.len() >= 2 { if args.len() >= 2 {
args.shift(); args.remove(0);
let util = args[0].as_slice(); let util = args[0].as_slice();
match umap.find_equiv(&util) { match umap.find_equiv(&util) {

4
src/whoami/whoami.rs
View file

@ -25,7 +25,7 @@ use std::io::print;
#[cfg(unix)] #[cfg(unix)]
mod platform { mod platform {
use super::libc; use super::libc;
use std::str; use std::string;
use self::c_types::{c_passwd, getpwuid}; use self::c_types::{c_passwd, getpwuid};
#[path = "../../common/c_types.rs"] mod c_types; #[path = "../../common/c_types.rs"] mod c_types;
@ -38,7 +38,7 @@ mod platform {
let passwd: *const c_passwd = getpwuid(geteuid()); let passwd: *const c_passwd = getpwuid(geteuid());
let pw_name: *const libc::c_char = (*passwd).pw_name; let pw_name: *const libc::c_char = (*passwd).pw_name;
let name = str::raw::from_c_str(pw_name); let name = string::raw::from_buf(pw_name as *const u8);
name name
} }