mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-12-01 02:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse source
This commit is contained in:
Arun Prakash Jana 2019-03-09 22:04:07 +05:30
parent 5f55bde141
commit 4289f13c40
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nnn.c
View file

@ -348,11 +348,13 @@ static char g_tmpfpath[HOME_LEN_MAX] __attribute__ ((aligned));
#ifdef LINUX_INOTIFY #ifdef LINUX_INOTIFY
static int inotify_fd, inotify_wd = -1; static int inotify_fd, inotify_wd = -1;
static uint INOTIFY_MASK = IN_ATTRIB | IN_CREATE | IN_DELETE | IN_DELETE_SELF | IN_MODIFY | IN_MOVE_SELF | IN_MOVED_FROM | IN_MOVED_TO; static uint INOTIFY_MASK = IN_ATTRIB | IN_CREATE | IN_DELETE | IN_DELETE_SELF
| IN_MODIFY | IN_MOVE_SELF | IN_MOVED_FROM | IN_MOVED_TO;
#elif defined(BSD_KQUEUE) #elif defined(BSD_KQUEUE)
static int kq, event_fd = -1; static int kq, event_fd = -1;
static struct kevent events_to_monitor[NUM_EVENT_FDS]; static struct kevent events_to_monitor[NUM_EVENT_FDS];
static uint KQUEUE_FFLAGS = NOTE_DELETE | NOTE_EXTEND | NOTE_LINK | NOTE_RENAME | NOTE_REVOKE | NOTE_WRITE; static uint KQUEUE_FFLAGS = NOTE_DELETE | NOTE_EXTEND | NOTE_LINK
| NOTE_RENAME | NOTE_REVOKE | NOTE_WRITE;
static struct timespec gtimeout; static struct timespec gtimeout;
#endif #endif
@ -2490,8 +2492,7 @@ static int dentfill(char *path, struct entry **dents)
namep = dp->d_name; namep = dp->d_name;
/* Skip self and parent */ /* Skip self and parent */
if ((namep[0] == '.' && (namep[1] == '\0' || if ((namep[0] == '.' && (namep[1] == '\0' || (namep[1] == '.' && namep[2] == '\0'))))
(namep[1] == '.' && namep[2] == '\0'))))
continue; continue;
if (!cfg.showhidden && namep[0] == '.') { if (!cfg.showhidden && namep[0] == '.') {
@ -2506,7 +2507,8 @@ static int dentfill(char *path, struct entry **dents)
ent_blocks = 0; ent_blocks = 0;
mkpath(path, namep, g_buf); mkpath(path, namep, g_buf);
mvprintw(LINES - 1, 0, "scanning %s [^C aborts]\n", xbasename(g_buf)); mvprintw(LINES - 1, 0, "scanning %s [^C aborts]\n",
xbasename(g_buf));
refresh(); refresh();
if (nftw(g_buf, nftw_fn, open_max, if (nftw(g_buf, nftw_fn, open_max,
FTW_MOUNT | FTW_PHYS) == -1) { FTW_MOUNT | FTW_PHYS) == -1) {
@ -2985,7 +2987,8 @@ nochange:
F_NORMAL | F_SIGINT); F_NORMAL | F_SIGINT);
runfile[0] = '\0'; runfile[0] = '\0';
} else } else
spawn(shell, newpath, NULL, path, F_NORMAL | F_SIGINT); spawn(shell, newpath, NULL, path,
F_NORMAL | F_SIGINT);
rundir[0] = '\0'; rundir[0] = '\0';
cfg.runscript = 0; cfg.runscript = 0;
setdirwatch(); setdirwatch();