From dd0a9539d378e89b95b07c4214f8e9e8d53de449 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Fri, 20 Apr 2018 17:03:33 +0200
Subject: [PATCH] Dont report empty path, i.e. .
---
Cargo.toml | 2 +-
src/main.rs | 17 ++++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index e07ed79..0001eb3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "hashtoc"
-version = "0.1.2"
+version = "0.1.3"
authors = ["Anders Blomdell <anders.blomdell@control.lth.se>"]
build = "build.rs"
links = "libhash.a,libssl"
diff --git a/src/main.rs b/src/main.rs
index 5269998..98bfda3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -502,6 +502,16 @@ fn dispatcher(options: clap::ArgMatches,
check_name(front.inode.path.as_os_str())) {
continue
}
+ let mut path = front.inode.path.as_path();
+ loop {
+ match path.strip_prefix("./") {
+ Ok(p) => path = p,
+ _ => break
+ }
+ }
+ if path.eq(Path::new("")) && front.kind != ' ' {
+ continue
+ }
match front.kind {
' ' => {
// Start of new path
@@ -534,13 +544,6 @@ fn dispatcher(options: clap::ArgMatches,
Unused => (),
_ => unreachable!()
}
- let mut path = front.inode.path.as_path();
- loop {
- match path.strip_prefix("./") {
- Ok(p) => path = p,
- _ => break
- }
- }
bprint!("{}:", front.kind);
bwrite!(path.as_os_str().as_bytes());
zprintln!();
--
GitLab