diff options
| author | Ron Yorston <rmy@pobox.com> | 2024-01-18 12:05:36 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2024-01-18 12:05:36 +0000 |
| commit | ea8742bc1657cd0aae32ac555560c8228795488f (patch) | |
| tree | c7ce739f32e55d6840bd4e2310fccb8eaaa2fcc6 /shell/ash.c | |
| parent | 54f94b75664725cd7146d60e8bde934be5243e21 (diff) | |
| download | busybox-w32-ea8742bc1657cd0aae32ac555560c8228795488f.tar.gz busybox-w32-ea8742bc1657cd0aae32ac555560c8228795488f.tar.bz2 busybox-w32-ea8742bc1657cd0aae32ac555560c8228795488f.zip | |
ash: workaround environment issue in Windows on ARM
The environment is handled differently in ARM64 Windows.
Assignments to 'environ' result in a compiler error. Omit the
offending code for now. NOFORK applets will cause a fork.
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 3c57c4577..e74662d8d 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -11662,9 +11662,10 @@ evalcommand(union node *cmd, int flags) | |||
| 11662 | 11662 | ||
| 11663 | default: { | 11663 | default: { |
| 11664 | 11664 | ||
| 11665 | //TODO: find a better solution for Windows on ARM than ignoring NOFORK | ||
| 11665 | #if ENABLE_FEATURE_SH_STANDALONE \ | 11666 | #if ENABLE_FEATURE_SH_STANDALONE \ |
| 11666 | && ENABLE_FEATURE_SH_NOFORK \ | 11667 | && ENABLE_FEATURE_SH_NOFORK \ |
| 11667 | && NUM_APPLETS > 1 | 11668 | && NUM_APPLETS > 1 && !(defined(_ARM64_) && ENABLE_PLATFORM_MINGW32) |
| 11668 | /* (1) BUG: if variables are set, we need to fork, or save/restore them | 11669 | /* (1) BUG: if variables are set, we need to fork, or save/restore them |
| 11669 | * around run_nofork_applet() call. | 11670 | * around run_nofork_applet() call. |
| 11670 | * (2) Should this check also be done in forkshell()? | 11671 | * (2) Should this check also be done in forkshell()? |