mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-29 12:07:46 +00:00
Merge pull request #280 from Arcterus/echo-fix
Make echo pass the Busybox test suite
This commit is contained in:
Oly Mi
commit
5c501cc815
2 changed files with 131 additions and 67 deletions
160
echo/echo.rs
160
echo/echo.rs
|
|
@ -20,17 +20,22 @@ use std::uint;
|
|||
#[path = "../common/util.rs"]
|
||||
mod util;
|
||||
|
||||
#[allow(dead_code)]
|
||||
static NAME: &'static str = "echo";
|
||||
static VERSION: &'static str = "1.0.0";
|
||||
|
||||
fn print_char(c: char) {
|
||||
print!("{}", c);
|
||||
#[deriving(Clone)]
|
||||
struct EchoOptions {
|
||||
newline: bool,
|
||||
escape: bool
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn to_char(bytes: &Vec<u8>, base: uint) -> char {
|
||||
uint::parse_bytes(bytes.as_slice(), base).unwrap() as u8 as char
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn isxdigit(c: u8) -> bool {
|
||||
match c as char {
|
||||
'0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' |
|
||||
|
|
@ -39,6 +44,7 @@ fn isxdigit(c: u8) -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn isodigit(c: u8) -> bool {
|
||||
match c as char {
|
||||
'0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => true,
|
||||
|
|
@ -46,7 +52,7 @@ fn isodigit(c: u8) -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
fn convert_str(string: &str, index: uint, base: uint) -> (char, int) {
|
||||
fn convert_str(string: &str, index: uint, base: uint) -> (char, uint) {
|
||||
let (max_digits, is_legal_digit) = match base {
|
||||
8u => (3, isodigit),
|
||||
16u => (2, isxdigit),
|
||||
|
|
@ -55,26 +61,74 @@ fn convert_str(string: &str, index: uint, base: uint) -> (char, int) {
|
|||
|
||||
let mut bytes = vec!();
|
||||
for offset in range(0, max_digits) {
|
||||
if string.len() <= index + offset as uint {
|
||||
break;
|
||||
}
|
||||
let c = string[index + offset as uint];
|
||||
if is_legal_digit(c) {
|
||||
bytes.push(c as u8);
|
||||
} else {
|
||||
if bytes.len() > 0 {
|
||||
return (to_char(&bytes, base), offset);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if bytes.len() == 0 {
|
||||
(' ', 0)
|
||||
} else {
|
||||
return (' ', offset);
|
||||
}
|
||||
(to_char(&bytes, base), bytes.len())
|
||||
}
|
||||
}
|
||||
|
||||
(to_char(&bytes, base), max_digits)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn main() { os::set_exit_status(uumain(os::args())); }
|
||||
|
||||
pub fn uumain(args: Vec<String>) -> int {
|
||||
fn parse_options(args: Vec<String>, options: &mut EchoOptions) -> Option<Vec<String>> {
|
||||
let mut echo_args = vec!();
|
||||
let program = args.get(0).clone();
|
||||
'argloop: for arg in args.move_iter().skip(1) {
|
||||
match arg.as_slice() {
|
||||
"--help" | "-h" => {
|
||||
print_help(&program);
|
||||
return None;
|
||||
}
|
||||
"--version" | "-V" => {
|
||||
print_version();
|
||||
return None;
|
||||
}
|
||||
"-n" => options.newline = true,
|
||||
"-e" => options.escape = true,
|
||||
"-E" => options.escape = false,
|
||||
_ => {
|
||||
if arg.as_slice().char_at(0) == '-' && arg.len() > 1 {
|
||||
let mut newopts = options.clone();
|
||||
let argptr: *String = &arg; // escape from the borrow checker
|
||||
for ch in unsafe { (*argptr).as_slice() }.chars().skip(1) {
|
||||
match ch {
|
||||
'h' => {
|
||||
print_help(&program);
|
||||
return None;
|
||||
}
|
||||
'V' => {
|
||||
print_version();
|
||||
return None;
|
||||
}
|
||||
'n' => newopts.newline = true,
|
||||
'e' => newopts.escape = true,
|
||||
'E' => newopts.escape = false,
|
||||
_ => {
|
||||
echo_args.push(arg);
|
||||
continue 'argloop;
|
||||
}
|
||||
}
|
||||
}
|
||||
*options = newopts;
|
||||
} else {
|
||||
echo_args.push(arg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(echo_args)
|
||||
}
|
||||
|
||||
fn print_help(program: &String) {
|
||||
let opts = [
|
||||
getopts::optflag("n", "", "do not output the trailing newline"),
|
||||
getopts::optflag("e", "", "enable interpretation of backslash escapes"),
|
||||
|
|
@ -82,18 +136,11 @@ pub fn uumain(args: Vec<String>) -> int {
|
|||
getopts::optflag("h", "help", "display this help and exit"),
|
||||
getopts::optflag("V", "version", "output version information and exit"),
|
||||
];
|
||||
|
||||
let matches = match getopts::getopts(args.tail(), opts) {
|
||||
Ok(m) => m,
|
||||
Err(f) => crash!(1, "Invalid options\n{}", f)
|
||||
};
|
||||
|
||||
if matches.opt_present("help") {
|
||||
println!("echo {:s} - display a line of text", VERSION);
|
||||
println!("");
|
||||
println!("Usage:");
|
||||
println!(" {0:s} [SHORT-OPTION]... [STRING]...", program);
|
||||
println!(" {0:s} LONG-OPTION", program);
|
||||
println!(" {0:s} [SHORT-OPTION]... [STRING]...", *program);
|
||||
println!(" {0:s} LONG-OPTION", *program);
|
||||
println!("");
|
||||
println(getopts::usage("Echo the STRING(s) to standard output.", opts).as_slice());
|
||||
println("If -e is in effect, the following sequences are recognized:
|
||||
|
|
@ -110,17 +157,29 @@ pub fn uumain(args: Vec<String>) -> int {
|
|||
\\v vertical tab
|
||||
\\0NNN byte with octal value NNN (1 to 3 digits)
|
||||
\\xHH byte with hexadecimal value HH (1 to 2 digits)");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if matches.opt_present("version") {
|
||||
fn print_version() {
|
||||
println!("echo version: {:s}", VERSION);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if !matches.free.is_empty() {
|
||||
let string = matches.free.connect(" ");
|
||||
if matches.opt_present("e") {
|
||||
#[allow(dead_code)]
|
||||
fn main() { os::set_exit_status(uumain(os::args())); }
|
||||
|
||||
pub fn uumain(args: Vec<String>) -> int {
|
||||
let mut options = EchoOptions {
|
||||
newline: false,
|
||||
escape: false
|
||||
};
|
||||
|
||||
let free = match parse_options(args, &mut options) {
|
||||
Some(vec) => vec,
|
||||
None => return 0
|
||||
};
|
||||
|
||||
if !free.is_empty() {
|
||||
let string = free.connect(" ");
|
||||
if options.escape {
|
||||
let mut prev_was_slash = false;
|
||||
let mut iter = string.as_slice().chars().enumerate();
|
||||
loop {
|
||||
|
|
@ -128,30 +187,29 @@ pub fn uumain(args: Vec<String>) -> int {
|
|||
Some((index, c)) => {
|
||||
if !prev_was_slash {
|
||||
if c != '\\' {
|
||||
print_char(c);
|
||||
print!("{}", c);
|
||||
} else {
|
||||
prev_was_slash = true;
|
||||
}
|
||||
} else {
|
||||
prev_was_slash = false;
|
||||
match c {
|
||||
'\\' => print_char('\\'),
|
||||
'a' => print_char('\x07'),
|
||||
'b' => print_char('\x08'),
|
||||
'\\' => print!("\\"),
|
||||
'a' => print!("\x07"),
|
||||
'b' => print!("\x08"),
|
||||
'c' => break,
|
||||
'e' => print_char('\x1B'),
|
||||
'f' => print_char('\x0C'),
|
||||
'n' => print_char('\n'),
|
||||
'r' => print_char('\r'),
|
||||
't' => print_char('\t'),
|
||||
'v' => print_char('\x0B'),
|
||||
'e' => print!("\x1B"),
|
||||
'f' => print!("\x0C"),
|
||||
'n' => print!("\n"),
|
||||
'r' => print!("\r"),
|
||||
't' => print!("\t"),
|
||||
'v' => print!("\x0B"),
|
||||
'x' => {
|
||||
let (c, num_char_used) = convert_str(string.as_slice(), index + 1, 16u);
|
||||
if num_char_used == 0 {
|
||||
print_char('\\');
|
||||
print_char('x');
|
||||
print!("\\x");
|
||||
} else {
|
||||
print_char(c);
|
||||
print!("{}", c);
|
||||
for _ in range(0, num_char_used) {
|
||||
iter.next(); // consume used characters
|
||||
}
|
||||
|
|
@ -160,18 +218,24 @@ pub fn uumain(args: Vec<String>) -> int {
|
|||
'0' => {
|
||||
let (c, num_char_used) = convert_str(string.as_slice(), index + 1, 8u);
|
||||
if num_char_used == 0 {
|
||||
print_char('\\');
|
||||
print_char('0');
|
||||
print!("\0");
|
||||
} else {
|
||||
print_char(c);
|
||||
print!("{}", c);
|
||||
for _ in range(0, num_char_used) {
|
||||
iter.next(); // consume used characters
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
print_char('\\');
|
||||
print_char(c);
|
||||
let (esc_c, num_char_used) = convert_str(string.as_slice(), index, 8u);
|
||||
if num_char_used == 0 {
|
||||
print!("\\{}", c);
|
||||
} else {
|
||||
print!("{}", esc_c);
|
||||
for _ in range(1, num_char_used) {
|
||||
iter.next(); // consume used characters
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -184,7 +248,7 @@ pub fn uumain(args: Vec<String>) -> int {
|
|||
}
|
||||
}
|
||||
|
||||
if !matches.opt_present("n") {
|
||||
if !options.newline {
|
||||
println!("")
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue