Keeping homedir NULL when no home directory could be determined,

so that nano will show a message about it.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5259 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index abcecb0f4f261e5954c32c207ed51cf0b6997624..819f73eba134456304e9992a1c07c53bc4d45662 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
        * src/search.c (do_research): If nothing was searched for yet during
        this run of nano, take the most recent item from the search history.
        This makes M-W work also right after startup, like <n> in vim/less.
+       * src/utils.c (get_homedir): Keep homedir NULL when no home directory
+       could be determined, so that nano will show a message about it.
 
 2015-06-18  Benno Schulenberg  <bensberg@justemail.net>
        * src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and

diff --git a/src/utils.c b/src/utils.c
index 9c936a5f0f2b60b69c3cc100093e681e6192b74d..36cd140eee99de9a2a534e4f9282653785d8e597 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -43,7 +43,11 @@ void get_homedir(void)
            if (userage != NULL)
                homenv = userage->pw_dir;
        }
-       homedir = mallocstrcpy(NULL, homenv);
+
+       /* Only set homedir if some home directory could be determined,
+        * otherwise keep homedir NULL. */
+       if (homenv != NULL && strcmp(homenv, "") != 0)
+           homedir = mallocstrcpy(NULL, homenv);
     }
 }