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

Optional fortune quotes in help/config page

Browse source
This commit is contained in:
Arun Prakash Jana 2019-10-12 23:02:44 +05:30
parent ec9331de17
commit e371182a5b
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -95,6 +95,7 @@ A curses library with wide char support (e.g. ncursesw), libreadline (`make O_NO
| trash-cli | optional | trash files (default action: delete) | | trash-cli | optional | trash files (default action: delete) |
| vlock (Linux), bashlock (macOS), lock(1) (BSD) | optional | terminal locker (fallback: [cmatrix](https://github.com/abishekvashok/cmatrix)) | | vlock (Linux), bashlock (macOS), lock(1) (BSD) | optional | terminal locker (fallback: [cmatrix](https://github.com/abishekvashok/cmatrix)) |
| advcpmv (Linux) ([integration](https://github.com/jarun/nnn/wiki/Advanced-use-cases#show-cp-mv-progress)) | optional | copy, move progress | | advcpmv (Linux) ([integration](https://github.com/jarun/nnn/wiki/Advanced-use-cases#show-cp-mv-progress)) | optional | copy, move progress |
| fortune | optional | random quotes in help screen |
| `$VISUAL` (else `$EDITOR`), `$PAGER`, `$SHELL` | optional | fallback vi, less, sh | | `$VISUAL` (else `$EDITOR`), `$PAGER`, `$SHELL` | optional | fallback vi, less, sh |
#### From a package manager #### From a package manager

32
src/nnn.c
View file

@ -2636,6 +2636,17 @@ static inline bool getutil(char *util)
return spawn("which", util, NULL, NULL, F_NORMAL | F_NOTRACE) == 0; return spawn("which", util, NULL, NULL, F_NORMAL | F_NOTRACE) == 0;
} }
static void pipetofd(char *cmd, int fd)
{
FILE *fp = popen(cmd, "r");
if (fp) {
while (fgets(g_buf, CMD_LEN_MAX - 1, fp))
dprintf(fd, "%s", g_buf);
pclose(fp);
}
}
/* /*
* Follows the stat(1) output closely * Follows the stat(1) output closely
*/ */
@ -2644,7 +2655,6 @@ static bool show_stats(const char *fpath, const char *fname, const struct stat *
int fd; int fd;
char *p, *begin = g_buf; char *p, *begin = g_buf;
size_t r; size_t r;
FILE *fp;
fd = create_tmp_file(); fd = create_tmp_file();
if (fd == -1) if (fd == -1)
@ -2656,12 +2666,7 @@ static bool show_stats(const char *fpath, const char *fname, const struct stat *
g_buf[r - 1] = '\0'; g_buf[r - 1] = '\0';
DPRINTF_S(g_buf); DPRINTF_S(g_buf);
fp = popen(g_buf, "r"); pipetofd(g_buf, fd);
if (fp) {
while (fgets(g_buf, CMD_LEN_MAX - 1, fp))
dprintf(fd, "%s", g_buf);
pclose(fp);
}
if (S_ISREG(sb->st_mode)) { if (S_ISREG(sb->st_mode)) {
/* Show file(1) output */ /* Show file(1) output */
@ -2996,6 +3001,9 @@ static void show_help(const char *path)
if (fd == -1) if (fd == -1)
return; return;
if (getutil("fortune"))
pipetofd("fortune -s", fd);
start = end = helpstr; start = end = helpstr;
while (*end) { while (*end) {
if (*end == '\n') { if (*end == '\n') {
@ -4385,11 +4393,11 @@ nochange:
break; break;
case SEL_NEW: case SEL_NEW:
r = get_input("create 'f'(ile) / 'd'(ir) / 's'(ym) / 'h'(ard)?"); r = get_input("create 'f'(ile) / 'd'(ir) / 's'(ym) / 'h'(ard)?");
if (r == 'f' || r == 'd') { if (r == 'f' || r == 'd')
tmp = xreadline(NULL, "name: "); tmp = xreadline(NULL, "name: ");
} else if (r == 's' || r == 'h') { else if (r == 's' || r == 'h')
tmp = xreadline(NULL, "link suffix [@ for none]: "); tmp = xreadline(NULL, "link suffix [@ for none]: ");
} else else
tmp = NULL; tmp = NULL;
break; break;
default: /* SEL_RENAME */ default: /* SEL_RENAME */
@ -4494,9 +4502,9 @@ nochange:
if (r == 'f') { if (r == 'f') {
r = openat(fd, tmp, O_CREAT, 0666); r = openat(fd, tmp, O_CREAT, 0666);
close(r); close(r);
} else if (r == 'd') { } else if (r == 'd')
r = mkdirat(fd, tmp, 0777); r = mkdirat(fd, tmp, 0777);
} else if (r == 's' || r == 'h') { else if (r == 's' || r == 'h') {
if (tmp[0] == '@' && tmp[1] == '\0') if (tmp[0] == '@' && tmp[1] == '\0')
tmp[0] = '\0'; tmp[0] = '\0';
r = xlink(tmp, path, newpath, &presel, r); r = xlink(tmp, path, newpath, &presel, r);