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
master
Benno Schulenberg 2015-06-20 08:21:35 +00:00
parent a267699440
commit e06472a249
2 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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);
}
}