From e54a8d16631893b00c0147a319e1ca814abfe3a1 Mon Sep 17 00:00:00 2001 From: nicm Date: Sat, 21 Nov 2009 17:52:18 +0000 Subject: 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. --- usr.bin/tmux/cmd-string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/tmux/cmd-string.c') diff --git a/usr.bin/tmux/cmd-string.c b/usr.bin/tmux/cmd-string.c index f18d97f5d32..6a5a0479e5e 100644 --- a/usr.bin/tmux/cmd-string.c +++ b/usr.bin/tmux/cmd-string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-string.c,v 1.9 2009/11/16 11:15:44 nicm Exp $ */ +/* $OpenBSD: cmd-string.c,v 1.10 2009/11/21 17:52:18 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -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; } -- cgit v1.2.3-59-g8ed1b