nnn

commit ca0a7b0558df7d8685f267ae84424237071f51b2
parent f04769f5a5bfcecdbe4716413156a614728a8d2b
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Fri, 10 Jan 2020 20:15:50 +0530

Simplify showing status bar symbols

Diffstat:
M
src/nnn.c
 | 
24
+++++++++++++++---------

1 file changed, 15 insertions(+), 9 deletions(-)
diff --git 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);