Commit213389c

authored

Merge pull request#8037 from martinkunkel2/main

tail: show end of device

2 parents142d920 +24a556b commit213389cCopy full SHA for 213389c

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ fn tail_file(`
`177`	`177`	`returnOk(());`
`178`	`178`	`}`
`179`	`179`	`observer.add_bad_path(path, input.display_name.as_str(),false)?;`
`180`		`-}elseif input.is_tailable(){`
	`180`	`+}else{`
`181`	`181`	`matchFile::open(path){`
`182`	`182`	`Ok(mut file) =>{`
`183`	`183`	`let st = file.metadata()?;`
`@@ -194,12 +194,16 @@ fn tail_file(`
`194`	`194`	`reader =BufReader::new(file);`
`195`	`195`	`unbounded_tail(&mut reader, settings)?;`
`196`	`196`	`}`
`197`		`- observer.add_path(`
`198`		`- path,`
`199`		`- input.display_name.as_str(),`
`200`		`-Some(Box::new(reader)),`
`201`		`-true,`
`202`		`-)?;`
	`197`	`+if input.is_tailable(){`
	`198`	`+ observer.add_path(`
	`199`	`+ path,`
	`200`	`+ input.display_name.as_str(),`
	`201`	`+Some(Box::new(reader)),`
	`202`	`+true,`
	`203`	`+)?;`
	`204`	`+}else{`
	`205`	`+ observer.add_bad_path(path, input.display_name.as_str(),false)?;`
	`206`	`+}`
`203`	`207`	`}`
`204`	`208`	`Err(e)if e.kind() ==ErrorKind::PermissionDenied =>{`
`205`	`209`	`observer.add_bad_path(path, input.display_name.as_str(),false)?;`
`@@ -220,8 +224,6 @@ fn tail_file(`
`220`	`224`	`}));`
`221`	`225`	`}`
`222`	`226`	`}`
`223`		`-}else{`
`224`		`- observer.add_bad_path(path, input.display_name.as_str(),false)?;`
`225`	`227`	`}`
`226`	`228`
`227`	`229`	`Ok(())`

Comments

(0)