summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTodd C. Miller <Todd.Miller@courtesan.com>2014-01-08 17:03:06 -0700
committerTodd C. Miller <Todd.Miller@courtesan.com>2014-01-08 17:03:06 -0700
commit803ec59958e2a3bab75a1b607ecf8ac9f4c81a76 (patch)
treed5ceda44d1ba519aed5bb6fcee45fac591b30829 /src
parent8bd131c100f271d7fe2d8e26b80c4b97cd04cfe6 (diff)
downloadsudo-803ec59958e2a3bab75a1b607ecf8ac9f4c81a76.tar.gz
Quiet a cppcheck warning about a negative subscript.
Diffstat (limited to 'src')
-rw-r--r--src/sesh.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sesh.c b/src/sesh.c
index 023f4d6db..3aa9789f4 100644
--- a/src/sesh.c
+++ b/src/sesh.c
@@ -46,7 +46,7 @@ int
main(int argc, char *argv[], char *envp[])
{
char *cp, *cmnd;
- bool noexec = false;
+ bool login_shell, noexec = false;
debug_decl(main, SUDO_DEBUG_MAIN)
setlocale(LC_ALL, "");
@@ -59,6 +59,9 @@ main(int argc, char *argv[], char *envp[])
/* Read sudo.conf. */
sudo_conf_read(NULL);
+ /* If the first char of argv[0] is '-', we are running as a login shell. */
+ login_shell = argv[0][0] == '-';
+
/* If argv[0] ends in -noexec, pass the flag to sudo_execve() */
if ((cp = strrchr(argv[0], '-')) != NULL && cp != argv[0])
noexec = strcmp(cp, "-noexec") == 0;
@@ -69,7 +72,7 @@ main(int argc, char *argv[], char *envp[])
cmnd = estrdup(argv[0]);
/* If invoked as a login shell, modify argv[0] accordingly. */
- if (argv[-1][0] == '-') {
+ if (login_shell) {
if ((cp = strrchr(argv[0], '/')) == NULL)
cp = argv[0];
*cp = '-';