From b08c9f004c1cb5f0f0c98c334cb9c0764c774939 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 11 Jul 2006 18:12:24 +0000 Subject: [PATCH] revert erroneous change git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3776 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 -- src/browser.c | 38 +++++++++++++++++++------------------- src/proto.h | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1ec571e..4531107b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,8 +34,6 @@ CVS code - - After entering "..", select the directory we were in before instead of the first filename in the list, as Pico does. (DLR) - Simplify screen update handling and exiting. (DLR) - - Move the opening of path here from do_browse_from(), so that - we no longer need a DIR* parameter. (DLR) do_browse_from() - During the operating directory check, if path isn't NULL, don't bother freeing it before mallocstrcpy()ing operating_dir diff --git a/src/browser.c b/src/browser.c index b8d59b20..f48e8c24 100644 --- a/src/browser.c +++ b/src/browser.c @@ -46,7 +46,7 @@ static bool search_last_file = FALSE; /* Our main file browser function. path is the tilde-expanded path to * start browsing from. */ -char *do_browser(char *path) +char *do_browser(char *path, DIR *dir) { char *retval = NULL; int kbinput; @@ -60,13 +60,6 @@ char *do_browser(char *path) /* The last answer the user typed on the statusbar. */ size_t old_selected; /* The selected file we had before the current selected file. */ - DIR *dir; - - /* If we have no path, or we can't open it, get out. */ - if (path == NULL || (dir = opendir(path)) == NULL) { - beep(); - goto cleanup_browser; - } curs_set(0); blank_statusbar(); @@ -377,16 +370,12 @@ char *do_browser(char *path) if (old_const_update) SET(CONST_UPDATE); - cleanup_browser: - if (path != NULL) - free(path); - if (ans != NULL) - free(ans); - if (filelist != NULL) { - free_chararray(filelist, filelist_len); - filelist = NULL; - filelist_len = 0; - } + free(path); + free(ans); + + free_chararray(filelist, filelist_len); + filelist = NULL; + filelist_len = 0; return retval; } @@ -399,6 +388,7 @@ char *do_browse_from(const char *inpath) struct stat st; char *path; /* This holds the tilde-expanded version of inpath. */ + DIR *dir = NULL; assert(inpath != NULL); @@ -431,7 +421,17 @@ char *do_browse_from(const char *inpath) path = mallocstrcpy(path, operating_dir); #endif - return do_browser(path); + if (path != NULL) + dir = opendir(path); + + /* If we can't open the path, get out. */ + if (dir == NULL) { + free(path); + beep(); + return NULL; + } + + return do_browser(path, dir); } /* Set filelist to the list of files contained in the directory path, diff --git a/src/proto.h b/src/proto.h index 4102bd3e..b7242362 100644 --- a/src/proto.h +++ b/src/proto.h @@ -143,7 +143,7 @@ extern char *homedir; /* Public functions in browser.c. */ #ifndef DISABLE_BROWSER -char *do_browser(char *path); +char *do_browser(char *path, DIR *dir); char *do_browse_from(const char *inpath); void browser_init(const char *path, DIR *dir); void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key); -- 2.39.5