From 3e460d91bd365b58860112fa1b517604f19ebbdf Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 13 Feb 2021 10:54:34 +0000 Subject: bc: fix to build on WIN32 and enable in default configurations --- configs/mingw32_defconfig | 12 ++++++------ configs/mingw64_defconfig | 12 ++++++------ miscutils/bc.c | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 4edf90df3..772f7fdb9 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.34.0.git -# Sun Feb 7 13:53:22 2021 +# Sat Feb 13 10:29:16 2021 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -753,12 +753,12 @@ CONFIG_REV=y # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BC is not set +CONFIG_BC=y CONFIG_DC=y -# CONFIG_FEATURE_DC_BIG is not set -CONFIG_FEATURE_DC_LIBM=y -# CONFIG_FEATURE_BC_INTERACTIVE is not set -# CONFIG_FEATURE_BC_LONG_OPTIONS is not set +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index ff73f9a51..f73f23fa3 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.34.0.git -# Sun Feb 7 13:53:22 2021 +# Sat Feb 13 10:37:01 2021 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -753,12 +753,12 @@ CONFIG_REV=y # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BC is not set +CONFIG_BC=y CONFIG_DC=y -# CONFIG_FEATURE_DC_BIG is not set -CONFIG_FEATURE_DC_LIBM=y -# CONFIG_FEATURE_BC_INTERACTIVE is not set -# CONFIG_FEATURE_BC_LONG_OPTIONS is not set +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 diff --git a/miscutils/bc.c b/miscutils/bc.c index 02a61ac49..046bad98e 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -7424,7 +7424,9 @@ static int xc_vm_init(const char *env_len) // from stdin is not interrupted by ^C either, // it restarts, thus fgetc() does not return on ^C. // (This problem manifests only if line editing is disabled) +# if !ENABLE_PLATFORM_MINGW32 signal_SA_RESTART_empty_mask(SIGINT, record_signo); +# endif // Without SA_RESTART, this exhibits a bug: // "while (1) print 1" and try ^C-ing it. -- cgit v1.2.3-55-g6feb