diff options
| author | Martin Storsjö <martin@martin.st> | 2025-12-03 15:45:01 +0200 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-12-08 21:19:18 +0000 |
| commit | 8d947d79316637597eb1cb2f2a840b0bbe67e855 (patch) | |
| tree | e13f1b3030d195d7c68a05c7efcde8471067ff58 /shell | |
| parent | 208649d7b5e27e5473f72381827364e4cfc0fc17 (diff) | |
| download | busybox-w32-8d947d79316637597eb1cb2f2a840b0bbe67e855.tar.gz busybox-w32-8d947d79316637597eb1cb2f2a840b0bbe67e855.tar.bz2 busybox-w32-8d947d79316637597eb1cb2f2a840b0bbe67e855.zip | |
ash: Extend ARM msvcrt workaround to 32 bit ARM too
The fact that "environ" is not assignable goes the same for
both 32 and 64 bit ARM on msvcrt - this is not an issue on UCRT
as noted in c44f23f4acbbd854eccd962110e41343d8f03296.
This extends the original workaround from
ea8742bc1657cd0aae32ac555560c8228795488f to 32 bit ARM too.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 12c95c338..aeb496c7a 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -11967,7 +11967,7 @@ evalcommand(union node *cmd, int flags) | |||
| 11967 | #if ENABLE_FEATURE_SH_STANDALONE \ | 11967 | #if ENABLE_FEATURE_SH_STANDALONE \ |
| 11968 | && ENABLE_FEATURE_SH_NOFORK \ | 11968 | && ENABLE_FEATURE_SH_NOFORK \ |
| 11969 | && NUM_APPLETS > 1 \ | 11969 | && NUM_APPLETS > 1 \ |
| 11970 | && !(defined(_ARM64_) && !defined(_UCRT) && ENABLE_PLATFORM_MINGW32) | 11970 | && !((defined(_ARM64_) || defined(_ARM_)) && !defined(_UCRT) && ENABLE_PLATFORM_MINGW32) |
| 11971 | /* (1) BUG: if variables are set, we need to fork, or save/restore them | 11971 | /* (1) BUG: if variables are set, we need to fork, or save/restore them |
| 11972 | * around run_nofork_applet() call. | 11972 | * around run_nofork_applet() call. |
| 11973 | * (2) Should this check also be done in forkshell()? | 11973 | * (2) Should this check also be done in forkshell()? |