From f10ef49534a5fcc3e8d24d71f4baed54baebe762 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Thu, 20 Apr 2017 23:20:28 +0530 Subject: [PATCH] Use NAME_MAX, reuse newpath, update stats --- README.md | 11 +++++---- nnn.c | 69 +++++++++++++++++++------------------------------------ 2 files changed, 30 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 5c1edf9d..22b919df 100644 --- a/README.md +++ b/README.md @@ -123,20 +123,21 @@ I chose to fork because: ### Performance -nnn vs. ncdu memory usage while listing `/usr/bin` with 1439 entries in disk usage analyzer mode, sorted by total content size: +nnn vs. ncdu memory usage while listing an external disk with 13,790 files in disk usage analyzer mode: ``` PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND -10406 vaio 20 0 53808 42284 2248 S 0.0 0.8 0:00.82 ncdu -10409 vaio 20 0 20452 9172 2356 S 0.0 0.2 0:00.83 nnn -d +31163 vaio 20 0 65508 53980 2320 S 0.0 1.1 0:01.96 ncdu / +28863 vaio 20 0 24276 11088 2776 S 0.3 0.2 0:02.61 nnn -d ``` -nnn vs. ranger memory usage while viewing a directory with 10,178 files, sorted by size: +nnn vs. mc vs. ranger memory usage while viewing a directory with 10,178 files, sorted by size: ``` PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 22465 vaio 20 0 233956 192136 7896 S 0.0 3.9 0:05.31 /usr/bin/python -O /usr/bin/ranger -21743 vaio 20 0 55984 44648 2468 S 0.0 0.9 0:01.17 nnn -d +20369 vaio 20 0 64664 10980 6888 S 0.0 0.2 0:00.70 mc +28863 vaio 20 0 20600 7220 2648 S 0.0 0.1 0:00.36 nnn -d ``` ### Installation diff --git a/nnn.c b/nnn.c index a6f282c4..153f1419 100644 --- a/nnn.c +++ b/nnn.c @@ -63,7 +63,7 @@ xprintf(int fd, const char *fmt, ...) #define CONTROL(c) ((c) ^ 0x40) #define TOUPPER(ch) \ (((ch) >= 'a' && (ch) <= 'z') ? ((ch) - 'a' + 'A') : (ch)) -#define MAX_CMD_LEN (PATH_MAX << 1) +#define MAX_CMD_LEN 5120 #define CURSYM(flag) (flag ? CURSR : EMPTY) struct assoc { @@ -111,7 +111,7 @@ struct key { #include "config.h" typedef struct entry { - char name[PATH_MAX]; + char name[NAME_MAX]; mode_t mode; time_t t; off_t size; @@ -229,73 +229,55 @@ xmemrchr(const void *s, int c, size_t n) return NULL; } -#if 0 -/* Some implementations of dirname(3) may modify `path' and some - * return a pointer inside `path'. */ -static char * -xdirname(const char *path) -{ - static char out[PATH_MAX]; - char tmp[PATH_MAX], *p; - - xstrlcpy(tmp, path, sizeof(tmp)); - p = dirname(tmp); - if (p == NULL) - printerr(1, "dirname"); - xstrlcpy(out, p, sizeof(out)); - return out; -} -#endif - /* * The following dirname(3) implementation does not - * change the input. We use a copy of the original. + * modify the input. We use a copy of the original. * * Modified from the glibc (GNU LGPL) version. */ static char * xdirname(const char *path) { - static char name[PATH_MAX]; + static char buf[PATH_MAX]; char *last_slash; - xstrlcpy(name, path, PATH_MAX); + xstrlcpy(buf, path, PATH_MAX); /* Find last '/'. */ - last_slash = strrchr(name, '/'); + last_slash = strrchr(buf, '/'); - if (last_slash != NULL && last_slash != name && last_slash[1] == '\0') { + if (last_slash != NULL && last_slash != buf && last_slash[1] == '\0') { /* Determine whether all remaining characters are slashes. */ char *runp; - for (runp = last_slash; runp != name; --runp) + for (runp = last_slash; runp != buf; --runp) if (runp[-1] != '/') break; /* The '/' is the last character, we have to look further. */ - if (runp != name) - last_slash = xmemrchr(name, '/', runp - name); + if (runp != buf) + last_slash = xmemrchr(buf, '/', runp - buf); } if (last_slash != NULL) { /* Determine whether all remaining characters are slashes. */ char *runp; - for (runp = last_slash; runp != name; --runp) + for (runp = last_slash; runp != buf; --runp) if (runp[-1] != '/') break; - /* Terminate the name. */ - if (runp == name) { + /* Terminate the buffer. */ + if (runp == buf) { /* The last slash is the first character in the string. We have to return "/". As a special case we have to return "//" if there are exactly two slashes at the beginning of the string. See XBD 4.10 Path Name Resolution for more information. */ - if (last_slash == name + 1) + if (last_slash == buf + 1) ++last_slash; else - last_slash = name + 1; + last_slash = buf + 1; } else last_slash = runp; @@ -304,11 +286,11 @@ xdirname(const char *path) /* This assignment is ill-designed but the XPG specs require to return a string containing "." in any case no directory part is found and so a static and constant string is required. */ - name[0] = '.'; - name[1] = '\0'; + buf[0] = '.'; + buf[1] = '\0'; } - return name; + return buf; } static void @@ -1452,8 +1434,7 @@ nochange: case SEL_CD: { /* Read target dir */ - char cwd[PATH_MAX]; - tmp = getcwd(cwd, PATH_MAX); + tmp = getcwd(newpath, PATH_MAX); if (tmp == NULL) { printwarn(); goto nochange; @@ -1468,7 +1449,7 @@ nochange: char *tmp = readline("chdir: "); initcurses(); - if (chdir(cwd) == -1) + if (chdir(newpath) == -1) printwarn(); /* Save current */ @@ -1641,16 +1622,14 @@ nochange: goto begin; case SEL_COPY: if (copier && ndents) { - char abspath[PATH_MAX]; - if (strcmp(path, "/") == 0) - snprintf(abspath, PATH_MAX, "/%s", + snprintf(newpath, PATH_MAX, "/%s", dents[cur].name); else - snprintf(abspath, PATH_MAX, "%s/%s", + snprintf(newpath, PATH_MAX, "%s/%s", path, dents[cur].name); - spawn(copier, abspath, NULL, 0); - printmsg(abspath); + spawn(copier, newpath, NULL, 0); + printmsg(newpath); } else if (!copier) printmsg("NNN_COPIER is not set"); goto nochange;