diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /miscutils/crontab.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'miscutils/crontab.c')
| -rw-r--r-- | miscutils/crontab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index 411a18a50..1111f4d54 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.c | |||
| @@ -55,8 +55,8 @@ static void edit_file(const struct passwd *pas, const char *file) | |||
| 55 | /* initgroups, setgid, setuid */ | 55 | /* initgroups, setgid, setuid */ |
| 56 | change_identity(pas); | 56 | change_identity(pas); |
| 57 | setup_environment(pas->pw_shell, | 57 | setup_environment(pas->pw_shell, |
| 58 | SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP, | 58 | SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP | SETUP_ENV_CHDIR, |
| 59 | pas); | 59 | pas); |
| 60 | ptr = getenv("VISUAL"); | 60 | ptr = getenv("VISUAL"); |
| 61 | if (!ptr) { | 61 | if (!ptr) { |
| 62 | ptr = getenv("EDITOR"); | 62 | ptr = getenv("EDITOR"); |