ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

browser: show an error message when selecting an inaccessible directory 

This fixes https://savannah.gnu.org/bugs/?48007.

Tested-by: Rishabh Dave <rishabhddave@gmail.com>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
master
Benno Schulenberg 2016-06-03 12:12:45 +02:00
parent aa09abe198
commit 956fead2e1
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/browser.c
View File

@ -46,7 +46,7 @@ static size_t selected = 0;
* start browsing from. */ * start browsing from. */
char *do_browser(char *path) char *do_browser(char *path)
{ {
char *retval = NULL; char *retval = NULL, *newpath = NULL;
int kbinput; int kbinput;
char *present_name = NULL; char *present_name = NULL;
/* The name of the currently selected file, or of the directory we /* The name of the currently selected file, or of the directory we
@ -75,17 +75,33 @@ char *do_browser(char *path)
/* Start with no key pressed. */ /* Start with no key pressed. */
kbinput = ERR; kbinput = ERR;
path = mallocstrassn(path, get_full_path(path)); path = mallocstrassn(path, get_full_path(newpath ? newpath : path));
/* Save the current path in order to be used later. */ if (path != NULL && newpath != NULL)
present_path = mallocstrcpy(present_path, path); dir = opendir(path);
if (path == NULL || dir == NULL) {
statusline(ALERT, "Cannot open directory: %s", strerror(errno));
/* If we don't have a file list yet, there is nothing to show. */
if (filelist == NULL) {
napms(1200);
lastmessage = HUSH;
free(path);
free(present_name);
return NULL;
}
path = mallocstrcpy(path, present_path);
present_name = mallocstrcpy(present_name, filelist[selected]);
}
assert(path != NULL && path[strlen(path) - 1] == '/'); assert(path != NULL && path[strlen(path) - 1] == '/');
/* Get the file list, and set longest and width in the process. */ if (dir != NULL) {
read_the_list(path, dir); /* Get the file list, and set longest and width in the process. */
read_the_list(path, dir);
closedir(dir); closedir(dir);
dir = NULL;
}
/* If given, reselect the present_name and then discard it. */ /* If given, reselect the present_name and then discard it. */
if (present_name != NULL) { if (present_name != NULL) {
@ -99,6 +115,9 @@ char *do_browser(char *path)
old_selected = (size_t)-1; old_selected = (size_t)-1;
newpath = NULL;
present_path = mallocstrcpy(present_path, path);
titlebar(path); titlebar(path);
while (TRUE) { while (TRUE) {
@ -323,22 +342,13 @@ char *do_browser(char *path)
break; break;
} }
dir = opendir(filelist[selected]); /* If we are moving up one level, remember where we came from, so
if (dir == NULL) {
statusline(ALERT, _("Error reading %s: %s"),
filelist[selected], strerror(errno));
continue;
}
/* If we moved up one level, remember where we came from, so
* this directory can be highlighted and easily reentered. */ * this directory can be highlighted and easily reentered. */
if (strcmp(tail(filelist[selected]), "..") == 0) if (strcmp(tail(filelist[selected]), "..") == 0)
present_name = striponedir(filelist[selected]); present_name = striponedir(filelist[selected]);
path = mallocstrcpy(path, filelist[selected]); /* Try opening and reading the selected directory. */
newpath = filelist[selected];
/* Start over again with the new path value. */
goto read_directory_contents; goto read_directory_contents;
} else if (func == do_exit) { } else if (func == do_exit) {
/* Exit from the file browser. */ /* Exit from the file browser. */