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

Show messages appropriately

Browse source
This commit is contained in:
Arun Prakash Jana 2020-05-03 15:14:26 +05:30
parent eee5057da5
commit 8b764a5f7c
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nnn.c
View file

@ -530,7 +530,7 @@ static const char * const messages[] = {
"'c'p / 'm'v as?", "'c'p / 'm'v as?",
"'c'urrent / 's'el?", "'c'urrent / 's'el?",
"rm -rf %s file%s?", "rm -rf %s file%s?",
"limit exceeded\n", "limit exceeded",
"'f'ile / 'd'ir / 's'ym / 'h'ard?", "'f'ile / 'd'ir / 's'ym / 'h'ard?",
"'c'li / 'g'ui?", "'c'li / 'g'ui?",
"overwrite?", "overwrite?",
@ -6432,6 +6432,7 @@ static char *load_input(int fd, char *path)
size_t offsets[LIST_FILES_MAX]; size_t offsets[LIST_FILES_MAX];
char **paths = NULL; char **paths = NULL;
ssize_t input_read, total_read = 0, off = 0; ssize_t input_read, total_read = 0, off = 0;
int msgnum = 0;
if (!input) { if (!input) {
DPRINTF_S(strerror(errno)); DPRINTF_S(strerror(errno));
@ -6470,7 +6471,7 @@ static char *load_input(int fd, char *path)
} }
if (entries == LIST_FILES_MAX) { if (entries == LIST_FILES_MAX) {
fprintf(stderr, messages[MSG_LIMIT], NULL); msgnum = MSG_LIMIT;
goto malloc_1; goto malloc_1;
} }
@ -6479,7 +6480,7 @@ static char *load_input(int fd, char *path)
} }
if (chunk_count == 512) { if (chunk_count == 512) {
fprintf(stderr, messages[MSG_LIMIT], NULL); msgnum = MSG_LIMIT;
goto malloc_1; goto malloc_1;
} }
@ -6498,7 +6499,7 @@ static char *load_input(int fd, char *path)
if (off != total_read) { if (off != total_read) {
if (entries == LIST_FILES_MAX) { if (entries == LIST_FILES_MAX) {
fprintf(stderr, messages[MSG_LIMIT], NULL); msgnum = MSG_LIMIT;
goto malloc_1; goto malloc_1;
} }
@ -6510,11 +6511,7 @@ static char *load_input(int fd, char *path)
DPRINTF_D(chunk_count); DPRINTF_D(chunk_count);
if (!entries) { if (!entries) {
if (g_states & STATE_PLUGIN_INIT) { msgnum = MSG_0_ENTRIES;
printmsg(messages[MSG_0_ENTRIES]);
xdelay(XDELAY_INTERVAL_MS);
} else
fprintf(stderr, "%s\n", messages[MSG_0_ENTRIES]);
goto malloc_1; goto malloc_1;
} }
@ -6566,6 +6563,13 @@ malloc_2:
for (i = entries - 1; i >= 0; --i) for (i = entries - 1; i >= 0; --i)
free(paths[i]); free(paths[i]);
malloc_1: malloc_1:
if (msgnum) {
if (g_states & STATE_PLUGIN_INIT) {
printmsg(messages[msgnum]);
xdelay(XDELAY_INTERVAL_MS);
} else
fprintf(stderr, "%s\n", messages[msgnum]);
}
free(input); free(input);
free(paths); free(paths);
return tmpdir; return tmpdir;