From 023dd7a55bd52fb80f3ce025b7cedcdeed88fe3a Mon Sep 17 00:00:00 2001
From: Robin Avery <robin@ribbanya.dev>
Date: Fri, 1 Mar 2024 20:18:27 -0500
Subject: [PATCH] objdiff-cli diff: Accept any kind of unit path (#48)

* objdiff-cli diff: Accept any kind of unit path

* Appease clippy

* Call `resolve_paths` in slightly fewer cases
---
 objdiff-cli/src/cmd/diff.rs | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/objdiff-cli/src/cmd/diff.rs b/objdiff-cli/src/cmd/diff.rs
index 997b688..ec15f35 100644
--- a/objdiff-cli/src/cmd/diff.rs
+++ b/objdiff-cli/src/cmd/diff.rs
@@ -1,4 +1,4 @@
-use std::{io::stdout, path::PathBuf};
+use std::{fs, io::stdout, path::PathBuf, str::FromStr};
 
 use anyhow::{bail, Context, Result};
 use argp::FromArgs;
@@ -74,12 +74,34 @@ pub fn run(args: Args) -> Result<()> {
                         )
                     };
                     if let Some(u) = u {
-                        let Some(object) =
-                            project_config.objects.iter_mut().find(|obj| obj.name() == u)
-                        else {
+                        let unit_path =
+                            PathBuf::from_str(u).ok().and_then(|p| fs::canonicalize(p).ok());
+
+                        let Some(object) = project_config.objects.iter_mut().find_map(|obj| {
+                            if obj.name.as_deref() == Some(u) {
+                                resolve_paths(obj);
+                                return Some(obj);
+                            }
+
+                            let Some(up) = unit_path.as_deref() else {
+                                return None;
+                            };
+
+                            resolve_paths(obj);
+
+                            if [&obj.base_path, &obj.target_path]
+                                .into_iter()
+                                .filter_map(|p| p.as_ref().and_then(|p| p.canonicalize().ok()))
+                                .any(|p| p == up)
+                            {
+                                return Some(obj);
+                            }
+
+                            None
+                        }) else {
                             bail!("Unit not found: {}", u)
                         };
-                        resolve_paths(object);
+
                         object
                     } else {
                         let mut idx = None;
@@ -92,7 +114,7 @@ pub fn run(args: Args) -> Result<()> {
                                 .as_deref()
                                 .map(|o| obj::elf::has_function(o, &args.symbol))
                                 .transpose()?
-                                .unwrap_or_default()
+                                .unwrap_or(false)
                             {
                                 idx = Some(i);
                                 count += 1;