From da848576312800dc229624e928d132d0702c1854 Mon Sep 17 00:00:00 2001 From: Jörg Hohensohn Date: Tue, 28 Dec 2004 22:16:07 +0000 Subject: prepared to mount multiple partitions into one logical file system (most useful for Ondio, internal memory + external MMC) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5514 a1c6a512-1295-4272-9138-f99709370657 --- apps/tree.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'apps/tree.c') diff --git a/apps/tree.c b/apps/tree.c index 87a039223e..71af90f017 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -302,6 +302,13 @@ static int compare(const void* p1, const void* p2) if (e1->attr & ATTR_DIRECTORY && e2->attr & ATTR_DIRECTORY) { /* two directories */ criteria = global_settings.sort_dir; + if (e1->attr & ATTR_VOLUME || e2->attr & ATTR_VOLUME) + { /* a volume identifier is involved */ + if (e1->attr & ATTR_VOLUME && e2->attr & ATTR_VOLUME) + criteria = 0; /* two volumes: sort alphabetically */ + else /* only one is a volume: volume first */ + return (e2->attr & ATTR_VOLUME) - (e1->attr & ATTR_VOLUME); + } } else if (!(e1->attr & ATTR_DIRECTORY) && !(e2->attr & ATTR_DIRECTORY)) { /* two files */ -- cgit v1.2.3