e2fsck: detect duplicated casefolded direntries for rehash

On pass2, support casefolded directories when looking for duplicated
entries.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 153e05f..f23a3a9 100644 (file)
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -344,6 +344,20 @@ static int dict_de_cmp(const void *cmp_ctx, const void *a, const void *b)
        return memcmp(de_a->name, de_b->name, a_len);
 }
 
+static int dict_de_cf_cmp(const void *cmp_ctx, const void *a, const void *b)
+{
+       const struct ext2fs_nls_table *tbl = cmp_ctx;
+       const struct ext2_dir_entry *de_a, *de_b;
+       int     a_len, b_len;
+
+       de_a = (const struct ext2_dir_entry *) a;
+       a_len = ext2fs_dirent_name_len(de_a);
+       de_b = (const struct ext2_dir_entry *) b;
+       b_len = ext2fs_dirent_name_len(de_b);
+
+       return ext2fs_casefold_cmp(tbl, de_a->name, a_len, de_b->name, b_len);
+}
+
 /*
  * This is special sort function that makes sure that directory blocks
  * with a dirblock of zero are sorted to the beginning of the list.
@@ -1255,7 +1269,13 @@ skip_checksum:
 
        dir_encpolicy_id = find_encryption_policy(ctx, ino);
 
-       dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
+       if (cf_dir) {
+               dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cf_cmp);
+               dict_set_cmp_context(&de_dict, (void *)ctx->fs->encoding);
+       } else {
+               dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
+       }
+
        prev = 0;
        do {
                dgrp_t group;