* Changed default sort order to size, descending, and don't sort dirs before files

* Fixed bug concerning multiple exclude patterns


git-svn-id: svn://blicky.net/ncdu/trunk@7 ce56bc8d-f834-0410-b703-f827bd498a76

2 files changed, 3 insertions, 3 deletions

diff --git a/src/browser.c b/src/browser.c
index 2cca4b2..d4a04db 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -284,7 +284,7 @@ void showBrowser(void) {
   bcur = dat.sub;
   bgraph = 1;
   nodelay(stdscr, 0);
-  bflags = BF_SIZE;
+  bflags = BF_SIZE | BF_DESC | BF_NDIRF;
 
   drawBrowser(0);
   refresh();
@@ -324,7 +324,7 @@ void showBrowser(void) {
         if(bflags & BF_SIZE)
           toggle(bflags, BF_DESC);
         else
-          bflags = (bflags & BF_HIDE) + (bflags & BF_NDIRF) + BF_SIZE;
+          bflags = (bflags & BF_HIDE) + (bflags & BF_NDIRF) + BF_SIZE + BF_DESC;
         break;
       case 'p':
         toggle(sflags, SF_SI);
diff --git a/src/exclude.c b/src/exclude.c
index 7344a32..d51ffb5 100644
--- a/src/exclude.c
+++ b/src/exclude.c
@@ -89,7 +89,7 @@ int matchExclude(char *path) {
     for(c = path; *c && !matched; c++)
       if(*c == '/' && c[1] != '/')
         matched = !fnmatch(n->pattern, c+1, 0);
-  } while((n = n->next) != NULL);
+  } while((n = n->next) != NULL && !matched);
 
   return(matched);
 }