Simplify detail printing

diff --git a/nnn.c b/nnn.c
index 76c302d9a195bbbe7a7903253fc777ea577b4bee..ce9a9efaca4cc71885329c786652a4e4e8d1d17f 100644 (file)
--- a/nnn.c
+++ b/nnn.c
@@ -1345,40 +1345,31 @@ printent_long(struct entry *ent, int sel, uint namecols)
        if (sel)
                attron(A_REVERSE);
 
-       if (!cfg.blkorder) {
-               if (S_ISDIR(ent->mode))
-                       printw("%s%-16.16s        /  %s/\n", CURSYM(sel), buf, pname);
-               else if (S_ISLNK(ent->mode))
-                       printw("%s%-16.16s        @  %s@\n", CURSYM(sel), buf, pname);
-               else if (S_ISSOCK(ent->mode))
-                       printw("%s%-16.16s        =  %s=\n", CURSYM(sel), buf, pname);
-               else if (S_ISFIFO(ent->mode))
-                       printw("%s%-16.16s        |  %s|\n", CURSYM(sel), buf, pname);
-               else if (S_ISBLK(ent->mode))
-                       printw("%s%-16.16s        b  %s\n", CURSYM(sel), buf, pname);
-               else if (S_ISCHR(ent->mode))
-                       printw("%s%-16.16s        c  %s\n", CURSYM(sel), buf, pname);
-               else if (ent->mode & 0100)
-                       printw("%s%-16.16s %8.8s* %s*\n", CURSYM(sel), buf, coolsize(ent->size), pname);
-               else
-                       printw("%s%-16.16s %8.8s  %s\n", CURSYM(sel), buf, coolsize(ent->size), pname);
-       } else {
-               if (S_ISDIR(ent->mode))
+       if (S_ISDIR(ent->mode)) {
+               if (cfg.blkorder)
                        printw("%s%-16.16s %8.8s/ %s/\n", CURSYM(sel), buf, coolsize(ent->blocks << 9), pname);
-               else if (S_ISLNK(ent->mode))
-                       printw("%s%-16.16s        @  %s@\n", CURSYM(sel), buf, pname);
-               else if (S_ISSOCK(ent->mode))
-                       printw("%s%-16.16s        =  %s=\n", CURSYM(sel), buf, pname);
-               else if (S_ISFIFO(ent->mode))
-                       printw("%s%-16.16s        |  %s|\n", CURSYM(sel), buf, pname);
-               else if (S_ISBLK(ent->mode))
-                       printw("%s%-16.16s        b  %s\n", CURSYM(sel), buf, pname);
-               else if (S_ISCHR(ent->mode))
-                       printw("%s%-16.16s        c  %s\n", CURSYM(sel), buf, pname);
-               else if (ent->mode & 0100)
+               else
+                       printw("%s%-16.16s        /  %s/\n", CURSYM(sel), buf, pname);
+       } else if (S_ISLNK(ent->mode))
+               printw("%s%-16.16s        @  %s@\n", CURSYM(sel), buf, pname);
+       else if (S_ISSOCK(ent->mode))
+               printw("%s%-16.16s        =  %s=\n", CURSYM(sel), buf, pname);
+       else if (S_ISFIFO(ent->mode))
+               printw("%s%-16.16s        |  %s|\n", CURSYM(sel), buf, pname);
+       else if (S_ISBLK(ent->mode))
+               printw("%s%-16.16s        b  %s\n", CURSYM(sel), buf, pname);
+       else if (S_ISCHR(ent->mode))
+               printw("%s%-16.16s        c  %s\n", CURSYM(sel), buf, pname);
+       else if (ent->mode & 0100) {
+               if (cfg.blkorder)
                        printw("%s%-16.16s %8.8s* %s*\n", CURSYM(sel), buf, coolsize(ent->blocks << 9), pname);
                else
+                       printw("%s%-16.16s %8.8s* %s*\n", CURSYM(sel), buf, coolsize(ent->size), pname);
+       } else {
+               if (cfg.blkorder)
                        printw("%s%-16.16s %8.8s  %s\n", CURSYM(sel), buf, coolsize(ent->blocks << 9), pname);
+               else
+                       printw("%s%-16.16s %8.8s  %s\n", CURSYM(sel), buf, coolsize(ent->size), pname);
        }
 
        if (sel)