mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silently ignore invalid paths (documented)

Browse source
This commit is contained in:
Arun Prakash Jana 2020-04-24 23:48:47 +05:30
parent d118c4cc24
commit f8a243ea91
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nnn.c
View file

@ -395,10 +395,9 @@ static char g_pipepath[TMP_LEN_MAX] __attribute__ ((aligned));
#define STATE_RANGESEL 0x4 #define STATE_RANGESEL 0x4
#define STATE_MOVE_OP 0x8 #define STATE_MOVE_OP 0x8
#define STATE_AUTONEXT 0x10 #define STATE_AUTONEXT 0x10
#define STATE_MSG 0x20 #define STATE_FORTUNE 0x20
#define STATE_TRASH 0x40 #define STATE_TRASH 0x40
#define STATE_FORCEQUIT 0x80 #define STATE_FORCEQUIT 0x80
#define STATE_FORTUNE 0x100
static uint g_states; static uint g_states;
@ -511,13 +510,12 @@ static char * const utils[] = {
#define MSG_INVALID_REG 36 #define MSG_INVALID_REG 36
#define MSG_ORDER 37 #define MSG_ORDER 37
#define MSG_LAZY 38 #define MSG_LAZY 38
#define MSG_IGNORED 39 #define MSG_FIRST 39
#define MSG_RM_TMP 40 #define MSG_RM_TMP 40
#define MSG_NOCHNAGE 41 #define MSG_NOCHNAGE 41
#define MSG_CANCEL 42 #define MSG_CANCEL 42
#define MSG_FIRST 43
#ifndef DIR_LIMITED_SELECTION #ifndef DIR_LIMITED_SELECTION
#define MSG_DIR_CHANGED 44 /* Must be the last entry */ #define MSG_DIR_CHANGED 43 /* Must be the last entry */
#endif #endif
static const char * const messages[] = { static const char * const messages[] = {
@ -560,7 +558,6 @@ static const char * const messages[] = {
"invalid regex", "invalid regex",
"'a'u / 'd'u / 'e'xtn / 'r'ev / 's'ize / 't'ime / 'v'er / 'c'lear?", "'a'u / 'd'u / 'e'xtn / 'r'ev / 's'ize / 't'ime / 'v'er / 'c'lear?",
"unmount failed! try lazy?", "unmount failed! try lazy?",
"ignoring invalid paths...",
"remove tmp file?", "remove tmp file?",
"unchanged", "unchanged",
"cancelled", "cancelled",
@ -5173,12 +5170,6 @@ begin:
if ((presel != FILTER) || !filterset()) if ((presel != FILTER) || !filterset())
redraw(path); redraw(path);
/* Display a one-time message */
if (listpath && (g_states & STATE_MSG)) {
g_states &= ~STATE_MSG;
printwait(messages[MSG_IGNORED], &presel);
}
nochange: nochange:
/* Exit if parent has exited */ /* Exit if parent has exited */
if (getppid() == 1) { if (getppid() == 1) {
@ -6301,7 +6292,7 @@ static char *make_tmp_tree(char **paths, ssize_t entries, const char *prefix)
{ {
/* tmpdir holds the full path */ /* tmpdir holds the full path */
/* tmp holds the path without the tmp dir prefix */ /* tmp holds the path without the tmp dir prefix */
int err, ignore = 0; int err;
struct stat sb; struct stat sb;
char *slash, *tmp; char *slash, *tmp;
ssize_t len = xstrlen(prefix); ssize_t len = xstrlen(prefix);
@ -6337,10 +6328,8 @@ static char *make_tmp_tree(char **paths, ssize_t entries, const char *prefix)
continue; continue;
err = stat(paths[i], &sb); err = stat(paths[i], &sb);
if (err && errno == ENOENT) { if (err && errno == ENOENT)
ignore = 1;
continue; continue;
}
/* Don't copy the common prefix */ /* Don't copy the common prefix */
xstrsncpy(tmp, paths[i] + len, xstrlen(paths[i]) - len + 1); xstrsncpy(tmp, paths[i] + len, xstrlen(paths[i]) - len + 1);
@ -6361,9 +6350,6 @@ static char *make_tmp_tree(char **paths, ssize_t entries, const char *prefix)
} }
} }
if (ignore)
g_states |= STATE_MSG;
/* Get the dir in which to start */ /* Get the dir in which to start */
*tmp = '\0'; *tmp = '\0';
return tmpdir; return tmpdir;