lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

misc: Reformat ssh_get_user_home_dir and ssh_file_readaccess_ok

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2018-10-30 15:53:50 +01:00
parent a4342b97d6
commit 9c4baa7fd5
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/misc.c
View File

@@ -213,39 +213,42 @@ int ssh_is_ipaddr(const char *str) {
#define NSS_BUFLEN_PASSWD 4096 #define NSS_BUFLEN_PASSWD 4096
#endif /* NSS_BUFLEN_PASSWD */ #endif /* NSS_BUFLEN_PASSWD */
char *ssh_get_user_home_dir(void) { char *ssh_get_user_home_dir(void)
char *szPath = NULL; {
struct passwd pwd; char *szPath = NULL;
struct passwd *pwdbuf; struct passwd pwd;
char buf[NSS_BUFLEN_PASSWD] = {0}; struct passwd *pwdbuf;
int rc; char buf[NSS_BUFLEN_PASSWD] = {0};
int rc;
rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
if (rc != 0) { if (rc != 0) {
szPath = getenv("HOME"); szPath = getenv("HOME");
if (szPath == NULL) { if (szPath == NULL) {
return NULL; return NULL;
} }
snprintf(buf, sizeof(buf), "%s", szPath); snprintf(buf, sizeof(buf), "%s", szPath);
return strdup(buf); return strdup(buf);
} }
szPath = strdup(pwd.pw_dir); szPath = strdup(pwd.pw_dir);
return szPath; return szPath;
} }
/* we have read access on file */ /* we have read access on file */
int ssh_file_readaccess_ok(const char *file) { int ssh_file_readaccess_ok(const char *file)
if (access(file, R_OK) < 0) { {
return 0; 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 pwd;
struct passwd *pwdbuf; struct passwd *pwdbuf;
char buf[NSS_BUFLEN_PASSWD]; char buf[NSS_BUFLEN_PASSWD];