pygos/pkg-utils
1
0
Fork 0
mirror of https://github.com/pygos/pkg-utils.git synced 2024-11-25 14:00:43 +01:00
Code Issues Releases Wiki Activity

make file list sorting more robust

Browse source 
If entries are sorted by length and some have the same length, sort
them asciibetically.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-04-17 16:27:39 +02:00
parent eadeee25d9
commit cd79a4fccf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/filelist/image_entry_sort.c
View file

@ -6,6 +6,8 @@
static int compare_ent(image_entry_t *a, image_entry_t *b) static int compare_ent(image_entry_t *a, image_entry_t *b)
{ {
int diff;
/* directories < .. < symlinks < devices < .. < files */ /* directories < .. < symlinks < devices < .. < files */
switch (a->mode & S_IFMT) { switch (a->mode & S_IFMT) {
case S_IFDIR: case S_IFDIR:
@ -31,7 +33,8 @@ static int compare_ent(image_entry_t *a, image_entry_t *b)
return -1; return -1;
} }
out_len: out_len:
return (int)strlen(a->name) - (int)strlen(b->name); diff = (int)strlen(a->name) - (int)strlen(b->name);
return diff ? diff : strcmp(a->name, b->name);
out_fsize: out_fsize:
if (a->data.file.size > b->data.file.size) if (a->data.file.size > b->data.file.size)
return 1; return 1;