Use home from struct passwd if HOME is empty as well as if it is NULL, and fix

a style nit. Both from Tiago Cunha.
This commit is contained in:
Nicholas Marriott
2009-11-21 17:52:18 +00:00
parent 58688c48aa
commit 9b9d26f80e
2 changed files with 2 additions and 3 deletions

View File

@ -332,7 +332,7 @@ cmd_string_expand_tilde(const char *s, size_t *p)
home = NULL;
if (cmd_string_getc(s, p) == '/') {
if ((home = getenv("HOME")) == NULL) {
if ((home = getenv("HOME")) == NULL || *home == '\0') {
if ((pw = getpwuid(getuid())) != NULL)
home = pw->pw_dir;
}