From 9c4baa7fd58b9e4d9cdab4a03d18dd03e0e587ab Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 30 Oct 2018 15:53:50 +0100 Subject: misc: Reformat ssh_get_user_home_dir and ssh_file_readaccess_ok Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider --- src/misc.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/misc.c b/src/misc.c index 402ece41..90b63330 100644 --- a/src/misc.c +++ b/src/misc.c @@ -213,39 +213,42 @@ int ssh_is_ipaddr(const char *str) { #define NSS_BUFLEN_PASSWD 4096 #endif /* NSS_BUFLEN_PASSWD */ -char *ssh_get_user_home_dir(void) { - char *szPath = NULL; - struct passwd pwd; - struct passwd *pwdbuf; - char buf[NSS_BUFLEN_PASSWD] = {0}; - int rc; - - rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); - if (rc != 0) { - szPath = getenv("HOME"); - if (szPath == NULL) { - return NULL; - } - snprintf(buf, sizeof(buf), "%s", szPath); - - return strdup(buf); - } +char *ssh_get_user_home_dir(void) +{ + char *szPath = NULL; + struct passwd pwd; + struct passwd *pwdbuf; + char buf[NSS_BUFLEN_PASSWD] = {0}; + int rc; + + rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); + if (rc != 0) { + szPath = getenv("HOME"); + if (szPath == NULL) { + return NULL; + } + snprintf(buf, sizeof(buf), "%s", szPath); - szPath = strdup(pwd.pw_dir); + return strdup(buf); + } + + szPath = strdup(pwd.pw_dir); - return szPath; + return szPath; } /* we have read access on file */ -int ssh_file_readaccess_ok(const char *file) { - if (access(file, R_OK) < 0) { - return 0; - } +int ssh_file_readaccess_ok(const char *file) +{ + if (access(file, R_OK) < 0) { + return 0; + } - return 1; + return 1; } -char *ssh_get_local_username(void) { +char *ssh_get_local_username(void) +{ struct passwd pwd; struct passwd *pwdbuf; char buf[NSS_BUFLEN_PASSWD]; -- cgit v1.2.3