From dd88842d5ad58e09e90611f91d4f75ea49a1fd17 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sat, 12 Aug 2017 14:59:08 +0200
Subject: [PATCH] tweaks: elide the global variable 'full_operating_dir'

There is no need to retain the (relative) path that the user
specified, so we can simply reuse that variable.
---
 src/browser.c |  6 ++----
 src/files.c   | 21 ++++++++-------------
 src/global.c  |  6 +-----
 src/proto.h   |  1 -
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/browser.c b/src/browser.c
index df980795..3619365e 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -251,8 +251,7 @@ char *do_browser(char *path)
 	    if (check_operating_dir(path, FALSE)) {
 		/* TRANSLATORS: This refers to the confining effect of the
 		 * option --operatingdir, not of --restricted. */
-		statusline(ALERT, _("Can't go outside of %s"),
-				full_operating_dir);
+		statusline(ALERT, _("Can't go outside of %s"), operating_dir);
 		path = mallocstrcpy(path, present_path);
 		continue;
 	    }
@@ -283,8 +282,7 @@ char *do_browser(char *path)
 	     * directory if it's ".." or if it's a symlink to a
 	     * directory outside the operating directory. */
 	    if (check_operating_dir(filelist[selected], FALSE)) {
-		statusline(ALERT, _("Can't go outside of %s"),
-				full_operating_dir);
+		statusline(ALERT, _("Can't go outside of %s"), operating_dir);
 		continue;
 	    }
 #endif
diff --git a/src/files.c b/src/files.c
index 18bda431..15beab36 100644
--- a/src/files.c
+++ b/src/files.c
@@ -433,7 +433,7 @@ bool open_buffer(const char *filename, bool undoable)
 #ifndef DISABLE_OPERATINGDIR
     if (check_operating_dir(filename, FALSE)) {
 	statusline(ALERT, _("Can't insert file from outside of %s"),
-				full_operating_dir);
+				operating_dir);
 	return FALSE;
     }
 #endif
@@ -1411,13 +1411,13 @@ char *safe_tempfile(FILE **f)
 /* Change to the specified operating directory, when it's valid. */
 void init_operating_dir(void)
 {
-    full_operating_dir = get_full_path(operating_dir);
+    operating_dir = free_and_assign(operating_dir, get_full_path(operating_dir));
 
     /* If the operating directory is inaccessible, fail. */
-    if (full_operating_dir == NULL || chdir(full_operating_dir) == -1)
+    if (operating_dir == NULL || chdir(operating_dir) == -1)
 	die(_("Invalid operating directory\n"));
 
-    snuggly_fit(&full_operating_dir);
+    snuggly_fit(&operating_dir);
 }
 
 /* Check to see if we're inside the operating directory.  Return FALSE
@@ -1426,11 +1426,6 @@ void init_operating_dir(void)
  * so that tab completion will work. */
 bool check_operating_dir(const char *currpath, bool allow_tabcomp)
 {
-    /* full_operating_dir is global for memory cleanup.  It should have
-     * already been initialized by init_operating_dir().  Also, a
-     * relative operating directory path will only be handled properly
-     * if this is done. */
-
     char *fullpath;
     bool retval = FALSE;
     const char *whereami1, *whereami2 = NULL;
@@ -1451,16 +1446,16 @@ bool check_operating_dir(const char *currpath, bool allow_tabcomp)
     if (fullpath == NULL)
 	return allow_tabcomp;
 
-    whereami1 = strstr(fullpath, full_operating_dir);
+    whereami1 = strstr(fullpath, operating_dir);
     if (allow_tabcomp)
-	whereami2 = strstr(full_operating_dir, fullpath);
+	whereami2 = strstr(operating_dir, fullpath);
 
     /* If both searches failed, we're outside the operating directory.
      * Otherwise, check the search results.  If the full operating
      * directory path is not at the beginning of the full current path
      * (for normal usage) and vice versa (for tab completion, if we're
      * allowing it), we're outside the operating directory. */
-    if (whereami1 != fullpath && whereami2 != full_operating_dir)
+    if (whereami1 != fullpath && whereami2 != operating_dir)
 	retval = TRUE;
     free(fullpath);
 
@@ -1589,7 +1584,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
     /* If we're writing a temporary file, we're probably going outside
      * the operating directory, so skip the operating directory test. */
     if (!tmp && check_operating_dir(realname, FALSE)) {
-	statusline(ALERT, _("Can't write outside of %s"), full_operating_dir);
+	statusline(ALERT, _("Can't write outside of %s"), operating_dir);
 	goto cleanup_and_exit;
     }
 #endif
diff --git a/src/global.c b/src/global.c
index dca4c653..363c034c 100644
--- a/src/global.c
+++ b/src/global.c
@@ -165,10 +165,7 @@ const char *locking_suffix = ".swp";
 #endif
 #ifndef DISABLE_OPERATINGDIR
 char *operating_dir = NULL;
-	/* The relative path to the operating directory, which we can't
-	 * move outside of. */
-char *full_operating_dir = NULL;
-	/* The full path to it. */
+	/* The path to our confining "operating" directory, when given. */
 #endif
 
 #ifndef DISABLE_SPELLER
@@ -1735,7 +1732,6 @@ void thanks_for_all_the_fish(void)
 #endif
 #ifndef DISABLE_OPERATINGDIR
     free(operating_dir);
-    free(full_operating_dir);
 #endif
     free(answer);
     free(last_search);
diff --git a/src/proto.h b/src/proto.h
index 6c36c4ac..b07f0340 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -132,7 +132,6 @@ extern const char *locking_suffix;
 #endif
 #ifndef DISABLE_OPERATINGDIR
 extern char *operating_dir;
-extern char *full_operating_dir;
 #endif
 
 #ifndef DISABLE_SPELLER