[git commit] ash: make EPOCH variables work if RANDOM is disabled

Denys Vlasenko vda.linux at googlemail.com
Wed Mar 29 14:45:13 UTC 2023


commit: https://git.busybox.net/busybox/commit/?id=470fa7b3648da2ea120d65fa7cde69cad0421353
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Commit 1d37186fe2 (ash: add bash-compatible EPOCH variables) added
support for the EPOCHSECONDS and EPOCHREALTIME variables.

These variables are dynamic and therefore require the VDYNAMIC flag
to be non-zero.  However, this is only the case if support for the
RANDOM variable is enabled.

Give VDYNAMIC a non-zero value if either EPOCH variables or RANDOM
are enabled.

Signed-off-by: Ron Yorston <rmy at pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/ash.c b/shell/ash.c
index 5f8c8ea19..559566b58 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2087,7 +2087,7 @@ struct localvar {
 #define VNOFUNC         0x40    /* don't call the callback function */
 #define VNOSET          0x80    /* do not set variable - just readonly test */
 #define VNOSAVE         0x100   /* when text is on the heap before setvareq */
-#if ENABLE_ASH_RANDOM_SUPPORT
+#if ENABLE_ASH_RANDOM_SUPPORT || BASH_EPOCH_VARS
 # define VDYNAMIC       0x200   /* dynamic variable */
 #else
 # define VDYNAMIC       0


More information about the busybox-cvs mailing list