Simplify showing status bar symbols

diff --git a/src/nnn.c b/src/nnn.c
index b0dd95fddf88871ac49f7d1d134e3ae6300507ae..a1526cf7226b7c991c7cd67524016907ff46b8bf 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -4219,9 +4219,11 @@ static void redraw(char *path)
        }
 
        if (ndents) {
-               char sort[] = "\0 \0\0";
+               char sort[] = "\0\0\0\0";
                pEntry pent = &dents[cur];
 
+               i = 0;
+
                if (cfg.mtimeorder)
                        sort[0] = cfg.mtime ? 'T' : 'A';
                else if (cfg.sizeorder)
@@ -4229,18 +4231,22 @@ static void redraw(char *path)
                else if (cfg.extnorder)
                        sort[0] = 'E';
 
-               if (entrycmpfn == &reventrycmp)
-                       sort[0] ? (sort[1] = 'R', sort[2] = ' ') : (sort[0] = 'R');
+               if (sort[i])
+                       ++i;
+
+               if (entrycmpfn == &reventrycmp) {
+                       sort[i] = 'R';
+                       ++i;
+               }
 
                if (namecmpfn == &xstrverscasecmp) {
-                       if (!sort[0])
-                               sort[0] = 'V';
-                       else if (sort[1] == ' ')
-                               sort[1] = 'V', sort[2] = ' ';
-                       else
-                               sort[2] = 'V', sort[3] = ' ';
+                       sort[i] = 'V';
+                       ++i;
                }
 
+               if (i)
+                       sort[i] = ' ';
+
                /* Get the file extension for regular files */
                if (S_ISREG(pent->mode)) {
                        i = (int)(pent->nlen - 1);