summaryrefslogtreecommitdiff
path: root/ext/pty/pty.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 01:12:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 01:12:52 +0000
commit89a7e87cd4deadff1aeefd24f40239a7919bec8d (patch)
treed2e4cdbc5d235e0b288411cec73dfb9438c4ebd6 /ext/pty/pty.c
parent00a2285917002726747929b1d13b6742ee87ea58 (diff)
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
Diffstat (limited to 'ext/pty/pty.c')
-rw-r--r--ext/pty/pty.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 8340e96..2ac412c 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);