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

cat: conditional compilation added

Browse source
This commit is contained in:
evgeniy 2016-10-18 19:09:36 +02:00
parent 2060048c79
commit 4a2b8e3c52
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/cat/cat.rs
View file

@ -321,22 +321,32 @@ impl<'a, W: Write> UnsafeWriter<'a, W> {
} }
// This method was used in Write::write only. It must not be called in the correct cat code // This method was used in Write::write only. It must not be called in the correct cat code
// and is placed in the bottleneck place, so it is not used anymore. // and is placed in the bottleneck place, so it is not used anymore in release build.
// Uncomment this and code in Write::write for more convenient testing of a new cat version. // In debug buld it is used to support bug finding
//#[inline(never)] #[cfg(debug_assertions)]
//fn fail() -> ! { #[inline(never)]
// panic!("assertion failed"); fn fail() -> ! {
//} panic!("assertion failed");
}
impl<'a, W: Write> Write for UnsafeWriter<'a, W> { impl<'a, W: Write> Write for UnsafeWriter<'a, W> {
#[cfg(debug_assertions)]
fn write(&mut self, buf: &[u8]) -> Result<usize> {
let dst = &mut self.buf[self.pos..];
let len = buf.len();
if len > dst.len() {
fail();
}
unsafe { copy_nonoverlapping(buf.as_ptr(), dst.as_mut_ptr(), len) }
self.pos += len;
Ok(len)
}
// a condition check excluded because it is false for current and every correct code
// see fail method comment for more information
#[cfg(not(debug_assertions))]
fn write(&mut self, buf: &[u8]) -> Result<usize> { fn write(&mut self, buf: &[u8]) -> Result<usize> {
//let dst = &mut self.buf[self.pos..];
let len = buf.len(); let len = buf.len();
// the condition is false for current code and every correct code
// see fail method comment for more information
// if len > dst.len() {
// fail();
// }
unsafe { copy_nonoverlapping(buf.as_ptr(), self.buf[self.pos..].as_mut_ptr(), len) } unsafe { copy_nonoverlapping(buf.as_ptr(), self.buf[self.pos..].as_mut_ptr(), len) }
self.pos += len; self.pos += len;
Ok(len) Ok(len)