Added --match-relative-path option and support

lib/cfg.h

@@ -75,6 +75,7 @@ typedef struct RmCfg {
     gboolean limits_specified;
     gboolean filter_mtime;
     gboolean match_basename;
+    gboolean match_relative_path;
     gboolean unmatched_basenames;
     gboolean match_with_extension;
     gboolean match_without_extension;

lib/cmdline.c

@@ -1437,6 +1437,7 @@ bool rm_cmd_parse_args(int argc, char **argv, RmSession *session) {
         {"must-match-untagged"      , 'M'  , 0         , G_OPTION_ARG_NONE      , &cfg->must_match_untagged      , _("Must have twin in untagged dir")                                       , NULL}     ,
         {"match-basename"           , 'b'  , 0         , G_OPTION_ARG_NONE      , &cfg->match_basename           , _("Only find twins with same basename")                                   , NULL}     ,
         {"match-extension"          , 'e'  , 0         , G_OPTION_ARG_NONE      , &cfg->match_with_extension     , _("Only find twins with same extension")                                  , NULL}     ,
+        {"match-relative-path"      , 0    , 0         , G_OPTION_ARG_NONE      , &cfg->match_relative_path      , _("Only find twins with same relative path")                              , NULL}     ,
         {"match-without-extension"  , 'i'  , 0         , G_OPTION_ARG_NONE      , &cfg->match_without_extension  , _("Only find twins with same basename minus extension")                   , NULL}     ,
         {"merge-directories"        , 'D'  , EMPTY     , G_OPTION_ARG_CALLBACK  , FUNC(merge_directories)        , _("Find duplicate directories")                                           , NULL}     ,
         {"honour-dir-layout"        , 'j'  , EMPTY     , G_OPTION_ARG_CALLBACK  , FUNC(honour_dir_layout)        , _("Only find directories with same file layout")                          , NULL}     ,

lib/file.c

@@ -180,6 +180,25 @@ gint rm_file_basenames_cmp(const RmFile *file_a, const RmFile *file_b) {
     return g_ascii_strcasecmp(file_a->folder->basename, file_b->folder->basename);
 }
 
+gint rm_file_relpaths_cmp(const RmFile *file_a, const RmFile *file_b) {
+    gint diff = file_a->depth - file_b->depth;
+    RETURN_IF_NONZERO(diff);
+    RmNode* node_a = file_a->folder;
+    RmNode* node_b = file_b->folder;
+
+    for (gint16 depth = file_a->depth; depth > 0; --depth) {
+        g_assert(node_a);
+        g_assert(node_b);
+
+        diff = g_ascii_strcasecmp(node_a->basename, node_b->basename);
+        RETURN_IF_NONZERO(diff);
+
+        node_a = node_a->parent;
+        node_b = node_b->parent;
+    }
+    return 0;
+}
+
 void rm_file_hardlink_add(RmFile *head, RmFile *link) {
     if(!head->hardlinks) {
         head->hardlinks = g_queue_new();

lib/file.h

@@ -377,4 +377,10 @@ RmFile *rm_file_copy(RmFile *file);
  */
 gint rm_file_basenames_cmp(const RmFile *file_a, const RmFile *file_b);
 
+/**
+ * @brief Compare relative paths of two files
+ * @retval true if relative paths match.
+ */
+gint rm_file_relpaths_cmp(const RmFile *file_a, const RmFile *file_b);
+
 #endif /* end of include guard */

lib/preprocess.c

@@ -84,6 +84,11 @@ gint rm_file_cmp(const RmFile *file_a, const RmFile *file_b) {
 
     if(cfg->match_without_extension) {
         result = rm_file_cmp_without_extension(file_a, file_b);
+        RETURN_IF_NONZERO(result);
+    }
+
+    if (cfg->match_relative_path) {
+        result = rm_file_relpaths_cmp(file_a, file_b);
     }
 
     return result;