From 83b99f00dedae6c82100b6820b18e414fec2525e Mon Sep 17 00:00:00 2001
From: "Jakob L. Kreuze" <zerodaysfordays@sdf.org>
Date: Mon, 25 May 2020 12:22:19 -0400
Subject: Canonicalize relative paths passed to `add`.

---
 src/main.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 989262f..a11d185 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -366,9 +366,9 @@ fn main() {
                 eprintln!("usage: {} add PATH [TAGS ...]", args[0]);
                 std::process::exit(1);
             }
-            let path = Path::new(&args[2]);
-            let hash = hash_file(path).unwrap();
-            let id = tb.import_image(path, &hash).unwrap();
+            let path = Path::new(&args[2]).canonicalize().unwrap();
+            let hash = hash_file(&path).unwrap();
+            let id = tb.import_image(&path, &hash).unwrap();
             for arg in args[3..].iter() {
                 tb.add_tag(arg).unwrap();
                 tb.tag_image(id, arg).unwrap();
@@ -379,7 +379,7 @@ fn main() {
                 eprintln!("usage: {} id_for PATH ", args[0]);
                 std::process::exit(1);
             }
-            let path = Path::new(&args[2]);
+            let path = Path::new(&args[2]).canonicalize().unwrap();
             println!("{}", tb.image_id(&path).unwrap());
         }
         "add_tags" => {
-- 
cgit v1.3