aboutsummaryrefslogtreecommitdiff
path: root/util-linux/script.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 13:56:39 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 13:56:39 +0000
commit811c449748d5bd0505f8510e5582892f94ac0cda (patch)
tree2640249cb2a9605c7cd59467b9861b205e9bcc8a /util-linux/script.c
parentc0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff)
parent19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff)
downloadbusybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz
busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2
busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts: coreutils/ls.c shell/ash.c
Diffstat (limited to 'util-linux/script.c')
-rw-r--r--util-linux/script.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/util-linux/script.c b/util-linux/script.c
index b9317fc7c..47efc4526 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -65,10 +65,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
65 if (!(opt & OPT_q)) { 65 if (!(opt & OPT_q)) {
66 printf("Script started, file is %s\n", fname); 66 printf("Script started, file is %s\n", fname);
67 } 67 }
68 shell = getenv("SHELL"); 68 shell = get_shell_name();
69 if (shell == NULL) {
70 shell = DEFAULT_SHELL;
71 }
72 69
73 pty = xgetpty(pty_line); 70 pty = xgetpty(pty_line);
74 71