From adf97f07807896c28abd2f0f721a62b9469b5ad6 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 12 Mar 2012 12:32:03 +0100 Subject: sulogin: check chdir and getcwd return values [-Wunused-result] sulogin.c: In function ‘sushell’: sulogin.c:338:7: warning: ignoring return value of ‘chdir’, declared with attribute warn_unused_result [-Wunused-result] sulogin.c:359:8: warning: ignoring return value of ‘getcwd’, declared with attribute warn_unused_result [-Wunused-result] Signed-off-by: Karel Zak --- login-utils/sulogin.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'login-utils/sulogin.c') diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c index 14843d0b4..013045936 100644 --- a/login-utils/sulogin.c +++ b/login-utils/sulogin.c @@ -327,15 +327,22 @@ static char *getpasswd(char *crypted) */ static void sushell(struct passwd *pwd) { - char shell[128]; - char home[128]; + char shell[PATH_MAX]; + char home[PATH_MAX]; char *p; char *sushell; /* * Set directory and shell. */ - chdir(pwd->pw_dir); + if (chdir(pwd->pw_dir) != 0) { + warn(_("%s: change directory failed"), pwd->pw_dir); + printf(_("Logging in with home = \"/\".\n")); + + if (chdir("/") != 0) + warn(_("change directory to system root failed")); + } + if ((p = getenv("SUSHELL")) != NULL) sushell = p; else if ((p = getenv("sushell")) != NULL) @@ -356,8 +363,9 @@ static void sushell(struct passwd *pwd) /* * Set some important environment variables. */ - getcwd(home, sizeof(home)); - setenv("HOME", home, 1); + if (getcwd(home, sizeof(home)) != NULL) + setenv("HOME", home, 1); + setenv("LOGNAME", "root", 1); setenv("USER", "root", 1); if (!profile) -- cgit v1.2.3-55-g7522