RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 21:47:46 +00:00
Code Issues Activity

Merge pull request #599 from jbcrail/fix-mkfifo

Browse source 
Fix mkfifo.
This commit is contained in:
Heather 2015-05-14 07:14:27 +03:00
commit 18a99f5bd5
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/mkfifo/mkfifo.rs
View file

@ -1,5 +1,5 @@
#![crate_name = "mkfifo"] #![crate_name = "mkfifo"]
#![feature(collections, core, os, rustc_private, std_misc)] #![feature(rustc_private)]
/* /*
* This file is part of the uutils coreutils package. * This file is part of the uutils coreutils package.
@ -14,8 +14,7 @@ extern crate getopts;
extern crate libc; extern crate libc;
use std::ffi::CString; use std::ffi::CString;
use std::num::FromStrRadix; use std::io::{Error, Write};
use std::os;
use libc::funcs::posix88::stat_::mkfifo; use libc::funcs::posix88::stat_::mkfifo;
#[path = "../common/util.rs"] #[path = "../common/util.rs"]
@ -32,7 +31,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
getopts::optflag("V", "version", "output version information and exit"), getopts::optflag("V", "version", "output version information and exit"),
]; ];
let matches = match getopts::getopts(args.tail(), &opts) { let matches = match getopts::getopts(&args[1..], &opts) {
Ok(m) => m, Ok(m) => m,
Err(err) => panic!("{}", err), Err(err) => panic!("{}", err),
}; };
@ -48,7 +47,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
println!("Usage:"); println!("Usage:");
println!(" {} [OPTIONS] NAME...", NAME); println!(" {} [OPTIONS] NAME...", NAME);
println!(""); println!("");
print!("{}", getopts::usage("Create a FIFO with the given name.", opts.as_slice()).as_slice()); print!("{}", getopts::usage("Create a FIFO with the given name.", &opts));
if matches.free.is_empty() { if matches.free.is_empty() {
return 1; return 1;
} }
@ -56,9 +55,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
} }
let mode = match matches.opt_str("m") { let mode = match matches.opt_str("m") {
Some(m) => match FromStrRadix::from_str_radix(m.as_slice(), 8) { Some(m) => match u16::from_str_radix(&m, 8) {
Ok(m) => m, Ok(m) => m,
Err(e )=> { Err(e)=> {
show_error!("invalid mode: {}", e); show_error!("invalid mode: {}", e);
return 1; return 1;
} }
@ -70,7 +69,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
for f in matches.free.iter() { for f in matches.free.iter() {
let err = unsafe { mkfifo(CString::new(f.as_bytes()).unwrap().as_ptr(), mode) }; let err = unsafe { mkfifo(CString::new(f.as_bytes()).unwrap().as_ptr(), mode) };
if err == -1 { if err == -1 {
show_error!("creating '{}': {}", f, os::error_string(os::errno())); show_error!("creating '{}': {}", f, Error::last_os_error().raw_os_error().unwrap());
exit_status = 1; exit_status = 1;
} }
} }