Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

1 files changed, 4 insertions, 3 deletions

diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index 163e15dce..16d7fdf69 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -20,8 +20,9 @@
 static void edit_file(const struct passwd *pas, const char *file)
 {
         const char *ptr;
-        int pid = xvfork();
+        pid_t pid;
 
+        pid = xvfork();
         if (pid) { /* parent */
                 wait4pid(pid);
                 return;
@@ -30,7 +31,7 @@ static void edit_file(const struct passwd *pas, const char *file)
         /* CHILD - change user and run editor */
         /* initgroups, setgid, setuid */
         change_identity(pas);
-        setup_environment(DEFAULT_SHELL,
+        setup_environment(pas->pw_shell,
                         SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP,
                         pas);
         ptr = getenv("VISUAL");
@@ -41,7 +42,7 @@ static void edit_file(const struct passwd *pas, const char *file)
         }
 
         BB_EXECLP(ptr, ptr, file, NULL);
-        bb_perror_msg_and_die("exec %s", ptr);
+        bb_perror_msg_and_die("can't execute '%s'", ptr);
 }
 
 static int open_as_user(const struct passwd *pas, const char *file)