From 89a7e87cd4deadff1aeefd24f40239a7919bec8d Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 30 Apr 2016 01:12:52 +0000 Subject: pty.c: dry up * ext/pty/pty.c (establishShell): gather initializations by the default shell path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/pty/pty.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ext/pty') diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 8340e96f1d..2ac412cfbc 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -164,7 +164,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info, char errbuf[32]; if (argc == 0) { - const char *shellname; + const char *shellname = "/bin/sh"; if ((p = getenv("SHELL")) != NULL) { shellname = p; @@ -175,10 +175,6 @@ establishShell(int argc, VALUE *argv, struct pty_info *info, struct passwd *pwent = getpwnam(username ? username : getlogin()); if (pwent && pwent->pw_shell) shellname = pwent->pw_shell; - else - shellname = "/bin/sh"; -#else - shellname = "/bin/sh"; #endif } v = rb_str_new2(shellname); -- cgit v1.2.3