From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 25 Jul 2012 19:15:24 +0000 (+0200)
Subject: sulogin: fix shadow declaration
X-Git-Tag: v2.22-rc1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f94bdce6230454fa3d9e6dc67bf07fa666b6c1d;p=thirdparty%2Futil-linux.git

sulogin: fix shadow declaration

login-utils/sulogin.c:337:8: warning: declaration of 'sushell' shadows a global declaration [-Wshadow]
login-utils/sulogin.c:332:13: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 7ac493be2f..d7d44b607e 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -334,7 +334,7 @@ static void sushell(struct passwd *pwd)
 	char shell[PATH_MAX];
 	char home[PATH_MAX];
 	char *p;
-	char *sushell;
+	char *su_shell;
 
 	/*
 	 * Set directory and shell.
@@ -348,17 +348,17 @@ static void sushell(struct passwd *pwd)
 	}
 
 	if ((p = getenv("SUSHELL")) != NULL)
-		sushell = p;
+		su_shell = p;
 	else if ((p = getenv("sushell")) != NULL)
-		sushell = p;
+		su_shell = p;
 	else {
 		if (pwd->pw_shell[0])
-			sushell = pwd->pw_shell;
+			su_shell = pwd->pw_shell;
 		else
-			sushell = "/bin/sh";
+			su_shell = "/bin/sh";
 	}
-	if ((p = strrchr(sushell, '/')) == NULL)
-		p = sushell;
+	if ((p = strrchr(su_shell, '/')) == NULL)
+		p = su_shell;
 	else
 		p++;
 
@@ -378,7 +378,7 @@ static void sushell(struct passwd *pwd)
 	/*
 	 * Try to execute a shell.
 	 */
-	setenv("SHELL", sushell, 1);
+	setenv("SHELL", su_shell, 1);
 	unmask_signal(SIGINT, &saved_sigint);
 	unmask_signal(SIGTSTP, &saved_sigtstp);
 	unmask_signal(SIGQUIT, &saved_sigquit);
@@ -399,8 +399,8 @@ static void sushell(struct passwd *pwd)
 		free(level);
 	}
 #endif
-	execl(sushell, shell, NULL);
-	warn(_("%s: exec failed"), sushell);
+	execl(su_shell, shell, NULL);
+	warn(_("%s: exec failed"), su_shell);
 
 	setenv("SHELL", "/bin/sh", 1);
 	execl("/bin/sh", profile ? "-sh" : "sh", NULL);