rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sort the dir alphabetically if explicitely requested.

Browse source 
This ensures that the test is independent of the directory order
of the files.
This commit is contained in:
Andrea Mazzoleni 2014-07-11 19:59:01 +02:00
parent 6c88c44970
commit 71ff0620ce
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmdline/scan.c
View file

@ -894,6 +894,14 @@ static int dd_ino_compare(const void* void_a, const void* void_b)
}
#endif
static int dd_name_compare(const void* void_a, const void* void_b)
{
const struct dirent_sorted* a = void_a;
const struct dirent_sorted* b = void_b;
return strcmp(a->d_name, b->d_name);
}
/**
* Returns the stat info of a dir entry.
*/
@ -1024,11 +1032,17 @@ static int scan_dir(struct snapraid_scan* scan, int output, const char* dir, con
}
#if HAVE_STRUCT_DIRENT_D_INO
/* if inodes are persistent */
if (!disk->has_volatile_inodes) {
if (state->opt.force_order == SORT_ALPHA) {
/* if requested sort alphabetically */
/* this is mainly done for testing to ensure to always */
/* process in the same way in different platforms */
tommy_list_sort(&list, dd_name_compare);
} else if (!disk->has_volatile_inodes) {
/* if inodes are persistent */
/* sort the list of dir entries by inodes */
tommy_list_sort(&list, dd_ino_compare);
}
/* otherwise just keep the insertion order */
#endif
/* process the sorted dir entries */