From cb1675dac717d0b266da8269d086bcb530fd91a8 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sat, 4 Jul 2020 17:43:16 +0200
Subject: [PATCH] tweaks: rename two functions and a variable, and improve two
 comments

---
 src/browser.c    | 21 ++++++++++-----------
 src/files.c      |  4 ++--
 src/prototypes.h |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/browser.c b/src/browser.c
index 9d1703a7..53a3972f 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -39,9 +39,9 @@ static size_t longest = 0;
 static size_t selected = 0;
 		/* The currently selected filename in the list; zero-based. */
 
-/* Our main file browser function.  path is the tilde-expanded path we
- * start browsing from. */
-char *do_browser(char *path)
+/* Allow the user to browse through the directories in the filesystem,
+ * starting at the given path. */
+char *browse(char *path)
 {
 	char *present_name = NULL;
 		/* The name of the currently selected file, or of the directory we
@@ -346,20 +346,19 @@ char *do_browser(char *path)
 	return chosen;
 }
 
-/* The file browser front end.  We check to see if inpath has a
- * directory in it.  If it does, we start do_browser() from there.
- * Otherwise, we start do_browser() from the current directory. */
-char *do_browse_from(const char *inpath)
+/* Prepare to start browsing.  If the given path has a directory part,
+ * start browsing in that directory, otherwise in the current directory. */
+char *browse_in(const char *inpath)
 {
 	char *path = real_dir_from_tilde(inpath);
-	struct stat st;
+	struct stat fileinfo;
 
 	/* If path is not a directory, try to strip a filename from it; if then
 	 * still not a directory, use the current working directory instead. */
-	if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+	if (stat(path, &fileinfo) == -1 || !S_ISDIR(fileinfo.st_mode)) {
 		path = free_and_assign(path, strip_last_component(path));
 
-		if (stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
+		if (stat(path, &fileinfo) == -1 || !S_ISDIR(fileinfo.st_mode)) {
 			char *currentdir = charalloc(PATH_MAX + 1);
 
 			path = free_and_assign(path, getcwd(currentdir, PATH_MAX + 1));
@@ -381,7 +380,7 @@ char *do_browse_from(const char *inpath)
 		path = mallocstrcpy(path, operating_dir);
 #endif
 
-	return do_browser(path);
+	return browse(path);
 }
 
 /* Set filelist to the list of files contained in the directory path,
diff --git a/src/files.c b/src/files.c
index f7e14f8e..d24d0c2e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1192,7 +1192,7 @@ void do_insertfile(bool execute)
 #endif
 #ifdef ENABLE_BROWSER
 			if (func == to_files) {
-				char *chosen = do_browse_from(answer);
+				char *chosen = browse_in(answer);
 
 				/* If no file was chosen, go back to the prompt. */
 				if (chosen == NULL)
@@ -2105,7 +2105,7 @@ int do_writeout(bool exiting, bool withprompt)
 
 #ifdef ENABLE_BROWSER
 		if (func == to_files) {
-			char *chosen = do_browse_from(answer);
+			char *chosen = browse_in(answer);
 
 			if (chosen == NULL)
 				continue;
diff --git a/src/prototypes.h b/src/prototypes.h
index 2281c497..5e439a7c 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -188,7 +188,7 @@ typedef void (*functionptrtype)(void);
 
 /* Most functions in browser.c. */
 #ifdef ENABLE_BROWSER
-char *do_browse_from(const char *inpath);
+char *browse_in(const char *inpath);
 void read_the_list(const char *path, DIR *dir);
 void browser_refresh(void);
 void browser_select_dirname(const char *needle);