Merge branch 'busybox' into merge

386 files changed, 14308 insertions, 714 deletions

diff --git a/Config.in b/Config.in
index a92360240..5bd98aa23 100644
--- a/Config.in
+++ b/Config.in
@@ -26,7 +26,7 @@ endchoice
 menu "Settings"
 
 config DESKTOP
-        bool "Enable compatibility for full-blown desktop systems"
+        bool "Enable compatibility for full-blown desktop systems (8kb)"
         default y
         help
         Enable applet options and features which are not essential.
diff --git a/Makefile b/Makefile
index d6e84984e..cb1a932b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 30
+PATCHLEVEL = 31
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 2d810d131..bf99656e2 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -301,7 +301,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config GUNZIP
-//config:       bool "gunzip (12 kb)"
+//config:       bool "gunzip (11 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
@@ -310,7 +310,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //config:       an archive, without decompressing it.
 //config:
 //config:config ZCAT
-//config:       bool "zcat (25 kb)"
+//config:       bool "zcat (24 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
@@ -415,7 +415,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config BUNZIP2
-//config:       bool "bunzip2 (8.8 kb)"
+//config:       bool "bunzip2 (8.7 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
@@ -429,7 +429,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //config:       should probably say N here.
 //config:
 //config:config BZCAT
-//config:       bool "bzcat (8.8 kb)"
+//config:       bool "bzcat (8.7 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
@@ -483,7 +483,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNLZMA
-//config:       bool "unlzma (8.6 kb)"
+//config:       bool "unlzma (7.5 kb)"
 //config:       default y
 //config:       help
 //config:       unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -492,7 +492,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //config:       compressors.
 //config:
 //config:config LZCAT
-//config:       bool "lzcat (8.5 kb)"
+//config:       bool "lzcat (7.5 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "unlzma -c".
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 357891ca3..38cc0219a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -7,7 +7,7 @@
  * about bzip2 library code.
  */
 //config:config BZIP2
-//config:       bool "bzip2 (18 kb)"
+//config:       bool "bzip2 (16 kb)"
 //config:       default y
 //config:       help
 //config:       bzip2 is a compression utility using the Burrows-Wheeler block
diff --git a/archival/cpio.c b/archival/cpio.c
index 9cacf9de6..0f37ffbb9 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -11,7 +11,7 @@
  * Only supports new ASCII and CRC formats
  */
 //config:config CPIO
-//config:       bool "cpio (14 kb)"
+//config:       bool "cpio (15 kb)"
 //config:       default y
 //config:       help
 //config:       cpio is an archival utility program used to create, modify, and
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 58bc4dba3..ddb5daf09 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -26,7 +26,7 @@
  *  - (unknown, please let me know when you find any)
  */
 //config:config DPKG
-//config:       bool "dpkg (44 kb)"
+//config:       bool "dpkg (43 kb)"
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index dc4738d28..c2c4cbbcc 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DPKG_DEB
-//config:       bool "dpkg_deb"
+//config:       bool "dpkg-deb (30 kb)"
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
diff --git a/archival/gzip.c b/archival/gzip.c
index 74d5d685f..12c1df242 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -22,7 +22,7 @@ gzip: bogus: No such file or directory
 aa:      85.1% -- replaced with aa.gz
 */
 //config:config GZIP
-//config:       bool "gzip (19 kb)"
+//config:       bool "gzip (17 kb)"
 //config:       default y
 //config:       help
 //config:       gzip is used to compress files.
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 09ee4ba5c..df26b375f 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -487,7 +487,7 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,
 }
 
 /* this is a public functions, but there is no prototype in a header file */
-static int lzo1x_999_compress_internal(const uint8_t *in , unsigned in_len,
+static int lzo1x_999_compress_internal(const uint8_t *in, unsigned in_len,
                 uint8_t *out, unsigned *out_len,
                 void *wrkmem,
                 unsigned good_length,
diff --git a/archival/lzop.c b/archival/lzop.c
index 8f604254c..585632c4e 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -25,7 +25,7 @@
    "Minimalized" for busybox by Alain Knaff
 */
 //config:config LZOP
-//config:       bool "lzop (13 kb)"
+//config:       bool "lzop (12 kb)"
 //config:       default y
 //config:       help
 //config:       Lzop compression/decompresion.
diff --git a/archival/rpm.c b/archival/rpm.c
index 700f90979..3dd4d4777 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RPM
-//config:       bool "rpm (33 kb)"
+//config:       bool "rpm (32 kb)"
 //config:       default y
 //config:       help
 //config:       Mini RPM applet - queries and extracts RPM packages.
@@ -508,7 +508,7 @@ int rpm_main(int argc, char **argv)
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RPM2CPIO
-//config:       bool "rpm2cpio (20 kb)"
+//config:       bool "rpm2cpio (21 kb)"
 //config:       default y
 //config:       help
 //config:       Converts a RPM file into a CPIO archive.
diff --git a/archival/tar.c b/archival/tar.c
index 7dd89a282..b9ae93004 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -23,7 +23,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TAR
-//config:       bool "tar (40 kb)"
+//config:       bool "tar (39 kb)"
 //config:       default y
 //config:       help
 //config:       tar is an archiving program. It's commonly used with gzip to
diff --git a/archival/unzip.c b/archival/unzip.c
index 473cbe2ec..6328f4bab 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -17,7 +17,7 @@
  * Zip64 + other methods
  */
 //config:config UNZIP
-//config:       bool "unzip (24 kb)"
+//config:       bool "unzip (26 kb)"
 //config:       default y
 //config:       help
 //config:       unzip will list or extract files from a ZIP archive,
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index f1c9287b5..fd4fd5623 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DUMPKMAP
-//config:       bool "dumpkmap (1.3 kb)"
+//config:       bool "dumpkmap (1.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c
index a353becd5..554a32403 100644
--- a/console-tools/fgconsole.c
+++ b/console-tools/fgconsole.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FGCONSOLE
-//config:       bool "fgconsole (1.6 kb)"
+//config:       bool "fgconsole (1.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index f16449dcd..cee37ab50 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KBD_MODE
-//config:       bool "kbd_mode (4 kb)"
+//config:       bool "kbd_mode (4.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 81d0c3db4..b5d4e8f43 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -10,14 +10,14 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LOADFONT
-//config:       bool "loadfont (5.4 kb)"
+//config:       bool "loadfont (5.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       This program loads a console font from standard input.
 //config:
 //config:config SETFONT
-//config:       bool "setfont (26 kb)"
+//config:       bool "setfont (24 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 404aba1fb..d4981ad21 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOADKMAP
-//config:       bool "loadkmap (1.5 kb)"
+//config:       bool "loadkmap (1.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 423122fe9..b01229a56 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config OPENVT
-//config:       bool "openvt (7 kb)"
+//config:       bool "openvt (7.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 614806ba7..113bb5c76 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RESET
-//config:       bool "reset (275 bytes)"
+//config:       bool "reset (345 bytes)"
 //config:       default y
 //config:       help
 //config:       This program is used to reset the terminal screen, if it
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 8aa487c41..59d468d48 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RESIZE
-//config:       bool "resize (756 bytes)"
+//config:       bool "resize (903 bytes)"
 //config:       default y
 //config:       help
 //config:       This program is used to (re)set the width and height of your current
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 7f0f9c711..0bc587241 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETCONSOLE
-//config:       bool "setconsole (3.7 kb)"
+//config:       bool "setconsole (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 1363ac9d1..259946dbb 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETKEYCODES
-//config:       bool "setkeycodes (1.7 kb)"
+//config:       bool "setkeycodes (2.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/coreutils/basename.c b/coreutils/basename.c
index 812a5e63e..0dd2c43c7 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -14,7 +14,7 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 //config:config BASENAME
-//config:       bool "basename (371 bytes)"
+//config:       bool "basename (438 bytes)"
 //config:       default y
 //config:       help
 //config:       basename is used to strip the directory and suffix from filenames,
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 27a0edf0d..ae216aa3f 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHGRP
-//config:       bool "chgrp (7.2 kb)"
+//config:       bool "chgrp (7.6 kb)"
 //config:       default y
 //config:       help
 //config:       chgrp is used to change the group ownership of files.
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 88989bf67..27e9b6b86 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHMOD
-//config:       bool "chmod (5.1 kb)"
+//config:       bool "chmod (5.5 kb)"
 //config:       default y
 //config:       help
 //config:       chmod is used to change the access permission of files.
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 6429fd030..a1c5c0224 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHOWN
-//config:       bool "chown (7.2 kb)"
+//config:       bool "chown (7.6 kb)"
 //config:       default y
 //config:       help
 //config:       chown is used to change the user and/or group ownership
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index e46e249f2..633322bc7 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CKSUM
-//config:       bool "cksum (4.2 kb)"
+//config:       bool "cksum (4.1 kb)"
 //config:       default y
 //config:       help
 //config:       cksum is used to calculate the CRC32 checksum of a file.
diff --git a/coreutils/comm.c b/coreutils/comm.c
index 4bee77677..c59fccdd1 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config COMM
-//config:       bool "comm (3.9 kb)"
+//config:       bool "comm (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       comm is used to compare two files line by line and return
diff --git a/coreutils/cp.c b/coreutils/cp.c
index b26c0e954..59e3d2f80 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -12,7 +12,7 @@
  * Size reduction.
  */
 //config:config CP
-//config:       bool "cp (9.7 kb)"
+//config:       bool "cp (10 kb)"
 //config:       default y
 //config:       help
 //config:       cp is used to copy files and directories.
diff --git a/coreutils/cut.c b/coreutils/cut.c
index cdd90ab44..e952dc17b 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CUT
-//config:       bool "cut (5.3 kb)"
+//config:       bool "cut (5.8 kb)"
 //config:       default y
 //config:       help
 //config:       cut is used to print selected parts of lines from
diff --git a/coreutils/date.c b/coreutils/date.c
index 87dc3bbd0..3414d38ae 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -19,7 +19,7 @@
    much as possible, missed out a lot of bounds checking */
 
 //config:config DATE
-//config:       bool "date (7.1 kb)"
+//config:       bool "date (7 kb)"
 //config:       default y
 //config:       help
 //config:       date is used to set the system date or display the
@@ -54,7 +54,7 @@
 //config:       date -s (and other commands like touch -d) use more sensible
 //config:       formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
 //config:
-//config:       With this option off, 'date DATE' is 'date -s DATE' support
+//config:       With this option off, 'date DATE' and 'date -s DATE' support
 //config:       the same format. With it on, 'date DATE' additionally supports
 //config:       MMDDhhmm[[YY]YY][.ss] format.
 
@@ -121,7 +121,7 @@
 //usage:     "\n        -d,--date TIME  Display TIME, not 'now'"
 //usage:        )
 //usage:        IF_FEATURE_DATE_ISOFMT(
-//usage:     "\n        -D FMT          Use FMT for -d TIME conversion"
+//usage:     "\n        -D FMT          Use FMT (strptime format) for -d TIME conversion"
 //usage:        )
 //usage:     "\n"
 //usage:     "\nRecognized TIME formats:"
diff --git a/coreutils/dd.c b/coreutils/dd.c
index d73f6224b..e0af8f4a3 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DD
-//config:       bool "dd (7.1 kb)"
+//config:       bool "dd (7.5 kb)"
 //config:       default y
 //config:       help
 //config:       dd copies a file (from standard input to standard output,
diff --git a/coreutils/df.c b/coreutils/df.c
index 50dccac52..f6d66e4b6 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -18,7 +18,7 @@
  * Implement -P and -B; better coreutils compat; cleanup
  */
 //config:config DF
-//config:       bool "df (7.5 kb)"
+//config:       bool "df (6.8 kb)"
 //config:       default y
 //config:       help
 //config:       df reports the amount of disk space used and available
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 511267b78..5aad121b5 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DIRNAME
-//config:       bool "dirname (289 bytes)"
+//config:       bool "dirname (329 bytes)"
 //config:       default y
 //config:       help
 //config:       dirname is used to strip a non-directory suffix from
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 9f098e41e..4039ed38c 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -12,14 +12,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DOS2UNIX
-//config:       bool "dos2unix (5.1 kb)"
+//config:       bool "dos2unix (5.2 kb)"
 //config:       default y
 //config:       help
 //config:       dos2unix is used to convert a text file from DOS format to
 //config:       UNIX format, and vice versa.
 //config:
 //config:config UNIX2DOS
-//config:       bool "unix2dos (5.1 kb)"
+//config:       bool "unix2dos (5.2 kb)"
 //config:       default y
 //config:       help
 //config:       unix2dos is used to convert a text file from UNIX format to
diff --git a/coreutils/du.c b/coreutils/du.c
index a0c99040e..0615a6e49 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -19,18 +19,16 @@
  * 4) Fixed busybox bug #1284 involving long overflow with human_readable.
  */
 //config:config DU
-//config:       bool "du (default blocksize of 512 bytes)"
+//config:       bool "du (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       du is used to report the amount of disk space used
 //config:       for specified files.
 //config:
 //config:config FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-//config:       bool "Use a default blocksize of 1024 bytes (1K)"
+//config:       bool "Use default blocksize of 1024 bytes (else it's 512 bytes)"
 //config:       default y
 //config:       depends on DU
-//config:       help
-//config:       Use a blocksize of (1K) instead of the default 512b.
 
 //applet:IF_DU(APPLET(du, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/coreutils/echo.c b/coreutils/echo.c
index e45b90940..5dc5be072 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -19,10 +19,10 @@
  *    The previous version did not allow 4-digit octals.
  */
 //config:config ECHO
-//config:       bool "echo (basic SuSv3 version taking no options)"
+//config:       bool "echo (1.8 kb)"
 //config:       default y
 //config:       help
-//config:       echo is used to print a specified string to stdout.
+//config:       echo prints a specified string to stdout.
 //config:
 //config:# this entry also appears in shell/Config.in, next to the echo builtin
 //config:config FEATURE_FANCY_ECHO
diff --git a/coreutils/env.c b/coreutils/env.c
index 0aebead1b..878068f09 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -24,7 +24,7 @@
  * - use xfunc_error_retval
  */
 //config:config ENV
-//config:       bool "env (3.8 kb)"
+//config:       bool "env (4 kb)"
 //config:       default y
 //config:       help
 //config:       env is used to set an environment variable and run
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 91084b80b..f7e4619f9 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -21,13 +21,13 @@
  *  Caveat: this versions of expand and unexpand don't accept tab lists.
  */
 //config:config EXPAND
-//config:       bool "expand (5.8 kb)"
+//config:       bool "expand (5.1 kb)"
 //config:       default y
 //config:       help
 //config:       By default, convert all tabs to spaces.
 //config:
 //config:config UNEXPAND
-//config:       bool "unexpand (6 kb)"
+//config:       bool "unexpand (5.3 kb)"
 //config:       default y
 //config:       help
 //config:       By default, convert only leading sequences of blanks to tabs.
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 00bcf60d4..900248103 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -23,7 +23,7 @@
  * provided they all associate ((x op x) op x).
  */
 //config:config EXPR
-//config:       bool "expr (6.1 kb)"
+//config:       bool "expr (6.6 kb)"
 //config:       default y
 //config:       help
 //config:       expr is used to calculate numbers and print the result
diff --git a/coreutils/factor.c b/coreutils/factor.c
index ee3943a4a..47fe179dc 100644
--- a/coreutils/factor.c
+++ b/coreutils/factor.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FACTOR
-//config:       bool "factor (2.6 kb)"
+//config:       bool "factor (2.7 kb)"
 //config:       default y
 //config:       help
 //config:       factor factorizes integers
diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index 5e77e2c16..c7cba9f61 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FSYNC
-//config:       bool "fsync (3.7 kb)"
+//config:       bool "fsync (3.6 kb)"
 //config:       default y
 //config:       help
 //config:       fsync is used to flush file-related cached blocks to disk.
diff --git a/coreutils/head.c b/coreutils/head.c
index fc3a48d5b..1219dfe8b 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HEAD
-//config:       bool "head (3.7 kb)"
+//config:       bool "head (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       head is used to print the first specified number of lines
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index d21e6d6ac..038809452 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HOSTID
-//config:       bool "hostid (247 bytes)"
+//config:       bool "hostid (286 bytes)"
 //config:       default y
 //config:       help
 //config:       hostid prints the numeric identifier (in hexadecimal) for
diff --git a/coreutils/id.c b/coreutils/id.c
index 5a7fb9aaf..00c0cd8ab 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -13,13 +13,13 @@
  * Added -G option Tito Ragusa (C) 2008 for SUSv3.
  */
 //config:config ID
-//config:       bool "id (6.7 kb)"
+//config:       bool "id (7 kb)"
 //config:       default y
 //config:       help
 //config:       id displays the current user and group ID names.
 //config:
 //config:config GROUPS
-//config:       bool "groups (6.5 kb)"
+//config:       bool "groups (6.7 kb)"
 //config:       default y
 //config:       help
 //config:       Print the group names associated with current user id.
diff --git a/coreutils/link.c b/coreutils/link.c
index d8d583b7b..23e0cfdd0 100644
--- a/coreutils/link.c
+++ b/coreutils/link.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LINK
-//config:       bool "link (3.1 kb)"
+//config:       bool "link (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       link creates hard links between files.
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 2dda5dae9..3fe2f3f64 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LN
-//config:       bool "ln (4.5 kb)"
+//config:       bool "ln (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       ln is used to create hard or soft links between files.
diff --git a/coreutils/logname.c b/coreutils/logname.c
index e614ca7cf..31ce61f0c 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -16,7 +16,7 @@
  * a diagnostic message and an error return.
  */
 //config:config LOGNAME
-//config:       bool "logname (894 bytes)"
+//config:       bool "logname (1.1 kb)"
 //config:       default y
 //config:       help
 //config:       logname is used to print the current user's login name.
diff --git a/coreutils/ls.c b/coreutils/ls.c
index fb4f998be..48927c964 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1206,8 +1206,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         nfiles = 0;
         do {
                 cur = my_stat(*argv, *argv,
-                        /* follow links on command line unless -l, -s or -F: */
-                        !(option_mask32 & (OPT_l|OPT_s|OPT_F))
+                        /* follow links on command line unless -l, -i, -s or -F: */
+                        !(option_mask32 & (OPT_l|OPT_i|OPT_s|OPT_F))
                         /* ... or if -H: */
                         || (option_mask32 & OPT_H)
                         /* ... or if -L, but my_stat always follows links if -L */
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 871145143..538df251b 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -6,31 +6,31 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MD5SUM
-//config:       bool "md5sum (6.8 kb)"
+//config:       bool "md5sum (6.5 kb)"
 //config:       default y
 //config:       help
 //config:       Compute and check MD5 message digest
 //config:
 //config:config SHA1SUM
-//config:       bool "sha1sum (6 kb)"
+//config:       bool "sha1sum (5.9 kb)"
 //config:       default y
 //config:       help
 //config:       Compute and check SHA1 message digest
 //config:
 //config:config SHA256SUM
-//config:       bool "sha256sum (7.1 kb)"
+//config:       bool "sha256sum (7 kb)"
 //config:       default y
 //config:       help
 //config:       Compute and check SHA256 message digest
 //config:
 //config:config SHA512SUM
-//config:       bool "sha512sum (7.6 kb)"
+//config:       bool "sha512sum (7.4 kb)"
 //config:       default y
 //config:       help
 //config:       Compute and check SHA512 message digest
 //config:
 //config:config SHA3SUM
-//config:       bool "sha3sum (6.3 kb)"
+//config:       bool "sha3sum (6.1 kb)"
 //config:       default y
 //config:       help
 //config:       Compute and check SHA3 message digest
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 986353dc6..0ee1d1f72 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -14,7 +14,7 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 //config:config MKDIR
-//config:       bool "mkdir (4.4 kb)"
+//config:       bool "mkdir (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       mkdir is used to create directories with the specified names.
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 0f614017e..e9d420ed8 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKFIFO
-//config:       bool "mkfifo (3.7 kb)"
+//config:       bool "mkfifo (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       mkfifo is used to create FIFOs (named pipes).
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index d57167f7d..eee0ac71d 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MKNOD
-//config:       bool "mknod (4 kb)"
+//config:       bool "mknod (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       mknod is used to create FIFOs or block/character special
diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c
index c041fedf7..5393320a5 100644
--- a/coreutils/mktemp.c
+++ b/coreutils/mktemp.c
@@ -29,7 +29,7 @@
  *        -p; else /tmp [deprecated]
  */
 //config:config MKTEMP
-//config:       bool "mktemp (4 kb)"
+//config:       bool "mktemp (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       mktemp is used to create unique temporary files
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 6e11197a1..b9f8f6982 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -12,7 +12,7 @@
  * Size reduction and improved error checking.
  */
 //config:config MV
-//config:       bool "mv (9.8 kb)"
+//config:       bool "mv (10 kb)"
 //config:       default y
 //config:       help
 //config:       mv is used to move or rename files or directories.
diff --git a/coreutils/nice.c b/coreutils/nice.c
index da1696c42..28591ac61 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NICE
-//config:       bool "nice (1.8 kb)"
+//config:       bool "nice (2.1 kb)"
 //config:       default y
 //config:       help
 //config:       nice runs a program with modified scheduling priority.
diff --git a/coreutils/nl.c b/coreutils/nl.c
index 2fdc9d85e..aea019c56 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NL
-//config:       bool "nl (4.3 kb)"
+//config:       bool "nl (4.6 kb)"
 //config:       default y
 //config:       help
 //config:       nl is used to number lines of files.
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 0ea8d1001..31e452bc4 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config NPROC
-//config:       bool "nproc (248 bytes)"
+//config:       bool "nproc (3.7 kb)"
 //config:       default y
 //config:       help
 //config:       Print number of CPUs
diff --git a/coreutils/paste.c b/coreutils/paste.c
index 52f67f951..3d81a5f1a 100644
--- a/coreutils/paste.c
+++ b/coreutils/paste.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PASTE
-//config:       bool "paste (4.5 kb)"
+//config:       bool "paste (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       paste is used to paste lines of different files together
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index b0468b3f7..5e195deaa 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PRINTENV
-//config:       bool "printenv (1 kb)"
+//config:       bool "printenv (1.3 kb)"
 //config:       default y
 //config:       help
 //config:       printenv is used to print all or part of environment.
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 67d3b2eda..5cf518699 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -38,7 +38,7 @@
 /* 19990508 Busy Boxed! Dave Cinege */
 
 //config:config PRINTF
-//config:       bool "printf (3.3 kb)"
+//config:       bool "printf (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       printf is used to format and print specified strings.
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index 345d85100..4c42284f4 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PWD
-//config:       bool "pwd (3.4 kb)"
+//config:       bool "pwd (3.7 kb)"
 //config:       default y
 //config:       help
 //config:       pwd is used to print the current directory.
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 49361cea0..09d69df2b 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READLINK
-//config:       bool "readlink (3.6 kb)"
+//config:       bool "readlink (4 kb)"
 //config:       default y
 //config:       help
 //config:       This program reads a symbolic link and returns the name
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index 43923681c..f5f868744 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config REALPATH
-//config:       bool "realpath (1.1 kb)"
+//config:       bool "realpath (1.6 kb)"
 //config:       default y
 //config:       help
 //config:       Return the canonicalized absolute pathname.
diff --git a/coreutils/rm.c b/coreutils/rm.c
index b68a82dc4..fd94bb5c4 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -11,7 +11,7 @@
  * Size reduction.
  */
 //config:config RM
-//config:       bool "rm (4.9 kb)"
+//config:       bool "rm (5.4 kb)"
 //config:       default y
 //config:       help
 //config:       rm is used to remove files or directories.
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 955740494..5092a5dfc 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RMDIR
-//config:       bool "rmdir (3.4 kb)"
+//config:       bool "rmdir (3.5 kb)"
 //config:       default y
 //config:       help
 //config:       rmdir is used to remove empty directories.
diff --git a/coreutils/seq.c b/coreutils/seq.c
index c26ff06b9..beb339d1e 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SEQ
-//config:       bool "seq (3.6 kb)"
+//config:       bool "seq (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       print a sequence of numbers
diff --git a/coreutils/shred.c b/coreutils/shred.c
index 0ebbc39ca..86d4b66b4 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SHRED
-//config:       bool "shred (5 kb)"
+//config:       bool "shred (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       Overwrite a file to hide its contents, and optionally delete it
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 126665839..7bfaab920 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -13,7 +13,7 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 //config:config SLEEP
-//config:       bool "sleep (1.7 kb)"
+//config:       bool "sleep (2 kb)"
 //config:       default y
 //config:       help
 //config:       sleep is used to pause for a specified number of seconds.
@@ -68,6 +68,11 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
         if (!*argv)
                 bb_show_usage();
 
+        /* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */
+        if (strncasecmp(argv[0], "inf", 3) == 0)
+                for (;;)
+                        sleep(INT_MAX);
+
 #if ENABLE_FEATURE_FANCY_SLEEP
 # if ENABLE_FLOAT_DURATION
         /* undo busybox.c setlocale */
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 05e5c9071..f04c6067b 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -12,7 +12,7 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
  */
 //config:config SORT
-//config:       bool "sort (7.4 kb)"
+//config:       bool "sort (7.7 kb)"
 //config:       default y
 //config:       help
 //config:       sort is used to sort lines of text in specified files.
diff --git a/coreutils/split.c b/coreutils/split.c
index 4e1db190c..c1e4ceab2 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SPLIT
-//config:       bool "split (5.4 kb)"
+//config:       bool "split (5 kb)"
 //config:       default y
 //config:       help
 //config:       Split a file into pieces.
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 43fad2324..32bc5e2d3 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -13,7 +13,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config STAT
-//config:       bool "stat (10 kb)"
+//config:       bool "stat (11 kb)"
 //config:       default y
 //config:       help
 //config:       display file or filesystem status.
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 424d909cf..6251f2aef 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -21,7 +21,7 @@
  * Special for busybox ported by Vladimir Oleynik <dzo@simtreas.ru> 2001
  */
 //config:config STTY
-//config:       bool "stty (8.6 kb)"
+//config:       bool "stty (8.9 kb)"
 //config:       default y
 //config:       help
 //config:       stty is used to change and print terminal line settings.
diff --git a/coreutils/sum.c b/coreutils/sum.c
index ee758877f..dba8e8e76 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -13,7 +13,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SUM
-//config:       bool "sum (4.3 kb)"
+//config:       bool "sum (4 kb)"
 //config:       default y
 //config:       help
 //config:       checksum and count the blocks in a file
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 9be47ab64..b93476aee 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SYNC
-//config:       bool "sync (769 bytes)"
+//config:       bool "sync (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       sync is used to flush filesystem buffers.
diff --git a/coreutils/tac.c b/coreutils/tac.c
index 6d3ea9c19..25e85f6f3 100644
--- a/coreutils/tac.c
+++ b/coreutils/tac.c
@@ -13,7 +13,7 @@
  * http://www.uclibc.org/lists/busybox/2003-July/008813.html
  */
 //config:config TAC
-//config:       bool "tac (4.1 kb)"
+//config:       bool "tac (3.9 kb)"
 //config:       default y
 //config:       help
 //config:       tac is used to concatenate and print files in reverse.
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 7335ba11e..14ed85d16 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -19,7 +19,7 @@
  * 7) lseek attempted when count==0 even if arg was +0 (from top)
  */
 //config:config TAIL
-//config:       bool "tail (7.1 kb)"
+//config:       bool "tail (6.8 kb)"
 //config:       default y
 //config:       help
 //config:       tail is used to print the last specified number of lines
diff --git a/coreutils/tee.c b/coreutils/tee.c
index f0ec791bb..fe5694331 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TEE
-//config:       bool "tee (4.3 kb)"
+//config:       bool "tee (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       tee is used to read from standard input and write
diff --git a/coreutils/test.c b/coreutils/test.c
index ddb66ddce..8d7dac025 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -20,7 +20,7 @@
  *     "This program is in the Public Domain."
  */
 //config:config TEST
-//config:       bool "test (3.6 kb)"
+//config:       bool "test (4.1 kb)"
 //config:       default y
 //config:       help
 //config:       test is used to check file types and compare values,
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 3b2140807..258cd276f 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -28,7 +28,7 @@
  * rewrite  14-11-2008 vda
  */
 //config:config TIMEOUT
-//config:       bool "timeout (5.5 kb)"
+//config:       bool "timeout (6 kb)"
 //config:       default y
 //config:       help
 //config:       Runs a program and watches it. If it does not terminate in
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 857761578..b30811157 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -13,7 +13,7 @@
  * Also, exiting on a failure was a bug.  All args should be processed.
  */
 //config:config TOUCH
-//config:       bool "touch (5.8 kb)"
+//config:       bool "touch (5.9 kb)"
 //config:       default y
 //config:       help
 //config:       touch is used to create or change the access and/or
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 10284e1c9..ae35a9ee3 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -19,7 +19,7 @@
  * TODO: graph, print
  */
 //config:config TR
-//config:       bool "tr (5.5 kb)"
+//config:       bool "tr (5.1 kb)"
 //config:       default y
 //config:       help
 //config:       tr is used to squeeze, and/or delete characters from standard
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
index f693570aa..233d0f2d1 100644
--- a/coreutils/truncate.c
+++ b/coreutils/truncate.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TRUNCATE
-//config:       bool "truncate (4.7 kb)"
+//config:       bool "truncate (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       truncate truncates files to a given size. If a file does
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 18ad7c566..ff6f2bb3b 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TTY
-//config:       bool "tty (3.3 kb)"
+//config:       bool "tty (3.6 kb)"
 //config:       default y
 //config:       help
 //config:       tty is used to print the name of the current terminal to
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 765809658..2a1602b4c 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -44,7 +44,7 @@
  *  Fix handling of -a to not print "unknown", add -o and -i support.
  */
 //config:config UNAME
-//config:       bool "uname (3.7 kb)"
+//config:       bool "uname (3.9 kb)"
 //config:       default y
 //config:       help
 //config:       uname is used to print system information.
@@ -59,7 +59,7 @@
 //config:
 //can't use "ARCH" for this applet, all hell breaks loose in build system :)
 //config:config BB_ARCH
-//config:       bool "arch (1.6 kb)"
+//config:       bool "arch (1.1 kb)"
 //config:       default y
 //config:       help
 //config:       Same as uname -m.
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index f71557b67..317f45531 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UNIQ
-//config:       bool "uniq (4.8 kb)"
+//config:       bool "uniq (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       uniq is used to remove duplicate lines from a sorted file.
diff --git a/coreutils/unlink.c b/coreutils/unlink.c
index 61b108a84..24be81da6 100644
--- a/coreutils/unlink.c
+++ b/coreutils/unlink.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config UNLINK
-//config:       bool "unlink (3.5 kb)"
+//config:       bool "unlink (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       unlink deletes a file by calling unlink()
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 684ab781b..51a015c44 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config USLEEP
-//config:       bool "usleep (1.1 kb)"
+//config:       bool "usleep (1.3 kb)"
 //config:       default y
 //config:       help
 //config:       usleep is used to pause for a specified number of microseconds.
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 5ef05ee4d..5f69e62b3 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -11,7 +11,7 @@
  * "end" line
  */
 //config:config UUDECODE
-//config:       bool "uudecode (5.9 kb)"
+//config:       bool "uudecode (5.8 kb)"
 //config:       default y
 //config:       help
 //config:       uudecode is used to decode a uuencoded file.
@@ -175,7 +175,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //kbuild:lib-$(CONFIG_BASE64) += uudecode.o
 
 //config:config BASE64
-//config:       bool "base64 (5 kb)"
+//config:       bool "base64 (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       Base64 encode and decode
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index aa53b14a6..2807ef82a 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UUENCODE
-//config:       bool "uuencode (4.6 kb)"
+//config:       bool "uuencode (4.4 kb)"
 //config:       default y
 //config:       help
 //config:       uuencode is used to uuencode a file.
diff --git a/coreutils/wc.c b/coreutils/wc.c
index c74b7a65f..99eb9dc87 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -33,7 +33,7 @@
  * for which 'wc -c' should output '0'.
  */
 //config:config WC
-//config:       bool "wc (4.4 kb)"
+//config:       bool "wc (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       wc is used to print the number of bytes, words, and lines,
diff --git a/coreutils/who.c b/coreutils/who.c
index 80226c3d6..be9c3ccca 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -15,7 +15,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHO
-//config:       bool "who (3.7 kb)"
+//config:       bool "who (3.9 kb)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
@@ -23,14 +23,14 @@
 //config:
 // procps-ng has this variation of "who":
 //config:config W
-//config:       bool "w (3.7 kb)"
+//config:       bool "w (3.8 kb)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
 //config:       Print users currently logged on.
 //config:
 //config:config USERS
-//config:       bool "users (3.2 kb)"
+//config:       bool "users (3.4 kb)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 9dab15817..49b5dd368 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHOAMI
-//config:       bool "whoami (2.9 kb)"
+//config:       bool "whoami (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       whoami is used to print the username of the current
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 6dc47355e..a51b1ad8e 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -11,7 +11,7 @@
  * Size reductions and removed redundant applet name prefix from error messages.
  */
 //config:config YES
-//config:       bool "yes (956 bytes)"
+//config:       bool "yes (1.2 kb)"
 //config:       default y
 //config:       help
 //config:       yes is used to repeatedly output a specific string, or
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 8aa892e3c..fd08a145e 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PIPE_PROGRESS
-//config:       bool "pipe_progress (225 bytes)"
+//config:       bool "pipe_progress (275 bytes)"
 //config:       default y
 //config:       help
 //config:       Display a dot to indicate pipe activity.
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index e4d61df35..c80cc863f 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -23,7 +23,7 @@
  * broken compatibility because the BusyBox policy doesn't allow them.
  */
 //config:config RUN_PARTS
-//config:       bool "run-parts (5.6 kb)"
+//config:       bool "run-parts (6.1 kb)"
 //config:       default y
 //config:       help
 //config:       run-parts is a utility designed to run all the scripts in a directory.
diff --git a/debianutils/which.c b/debianutils/which.c
index 9b10b62f9..14d452cd5 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHICH
-//config:       bool "which (3.7 kb)"
+//config:       bool "which (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       which is used to find programs in your PATH and
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index 76a5253b6..c93e209b5 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -10,7 +10,7 @@
  * Public License
  */
 //config:config CHATTR
-//config:       bool "chattr (3.2 kb)"
+//config:       bool "chattr (3.8 kb)"
 //config:       default y
 //config:       help
 //config:       chattr changes the file attributes on a second extended file system.
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index f5aa3dbe4..8a14b3bdc 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -34,7 +34,7 @@
  * It doesn't guess filesystem types from on-disk format.
  */
 //config:config FSCK
-//config:       bool "fsck (6.7 kb)"
+//config:       bool "fsck (7.4 kb)"
 //config:       default y
 //config:       help
 //config:       fsck is used to check and optionally repair one or more filesystems.
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 56c1187c1..be1488b79 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -10,7 +10,7 @@
  * Public License
  */
 //config:config LSATTR
-//config:       bool "lsattr (5 kb)"
+//config:       bool "lsattr (5.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/editors/awk.c b/editors/awk.c
index 8e79d3159..17bbdc62a 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config AWK
-//config:       bool "awk (22 kb)"
+//config:       bool "awk (23 kb)"
 //config:       default y
 //config:       help
 //config:       Awk is used as a pattern scanning and processing language.
diff --git a/editors/cmp.c b/editors/cmp.c
index 2a410fdec..6e27a841a 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CMP
-//config:       bool "cmp (5.4 kb)"
+//config:       bool "cmp (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       cmp is used to compare two files and returns the result
diff --git a/editors/ed.c b/editors/ed.c
index 05797692c..1a36add39 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -7,7 +7,7 @@
  * The "ed" built-in command (much simplified)
  */
 //config:config ED
-//config:       bool "ed (25 kb)"
+//config:       bool "ed (21 kb)"
 //config:       default y
 //config:       help
 //config:       The original 1970's Unix text editor, from the days of teletypes.
diff --git a/editors/patch.c b/editors/patch.c
index eca6bc5f6..0ce0210fd 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -21,7 +21,7 @@
  * [file] which file to patch
  */
 //config:config PATCH
-//config:       bool "patch (9.1 kb)"
+//config:       bool "patch (9.4 kb)"
 //config:       default y
 //config:       help
 //config:       Apply a unified diff formatted patch.
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index 2c958d287..3ffbf9084 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -26,7 +26,7 @@
 USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
 
 config PATCH
-        bool "patch (9.1 kb)"
+        bool "patch (9.4 kb)"
         default y
         help
           usage: patch [-i file] [-p depth] [-Ru]
diff --git a/editors/vi.c b/editors/vi.c
index 57fac59ad..433a37908 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
  *      An "ex" line oriented mode- maybe using "cmdedit"
  */
 //config:config VI
-//config:       bool "vi (22 kb)"
+//config:       bool "vi (23 kb)"
 //config:       default y
 //config:       help
 //config:       'vi' is a text editor. More specifically, it is the One True
diff --git a/findutils/find.c b/findutils/find.c
index 6407c6c5a..06ad1b39c 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -1467,6 +1467,12 @@ int find_main(int argc UNUSED_PARAM, char **argv)
                         break;
                 if (!saved[1])
                         break; /* it is "-" */
+                if (saved[1] == '-' && !saved[2]) {
+                        /* it is "--" */
+                        /* Try: find -- /dev/null */
+                        saved = *++past_HLP;
+                        break;
+                }
                 if ((saved+1)[strspn(saved+1, "HLP")] != '\0')
                         break;
         }
diff --git a/findutils/grep.c b/findutils/grep.c
index 3e8ea9239..a4033a40b 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -18,19 +18,19 @@
  * (C) 2006 Jac Goudsmit added -o option
  */
 //config:config GREP
-//config:       bool "grep (8.5 kb)"
+//config:       bool "grep (8.6 kb)"
 //config:       default y
 //config:       help
 //config:       grep is used to search files for a specified pattern.
 //config:
 //config:config EGREP
-//config:       bool "egrep (7.6 kb)"
+//config:       bool "egrep (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "grep -E".
 //config:
 //config:config FGREP
-//config:       bool "fgrep (7.6 kb)"
+//config:       bool "fgrep (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "grep -F".
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 6df8a035d..d014669bd 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -15,7 +15,7 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
  */
 //config:config XARGS
-//config:       bool "xargs (6.7 kb)"
+//config:       bool "xargs (7.2 kb)"
 //config:       default y
 //config:       help
 //config:       xargs is used to execute a specified command for
diff --git a/include/libbb.h b/include/libbb.h
index dc1c81865..1b5994357 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -579,6 +579,8 @@ void sig_unblock(int sig) FAST_FUNC;
 int sigaction_set(int sig, const struct sigaction *act) FAST_FUNC;
 /* SIG_BLOCK/SIG_UNBLOCK all signals: */
 int sigprocmask_allsigs(int how) FAST_FUNC;
+/* Return old set in the same set: */
+int sigprocmask2(int how, sigset_t *set) FAST_FUNC;
 #else
 #define bb_signals(s, f)
 #define kill_myself_with_sig(s)
@@ -1835,7 +1837,7 @@ enum {
         FOR_SHELL        = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
 };
 line_input_t *new_line_input_t(int flags) FAST_FUNC;
-/* So far static: void free_line_input_t(line_input_t *n) FAST_FUNC; */
+void free_line_input_t(line_input_t *n) FAST_FUNC;
 /*
  * maxsize must be >= 2.
  * Returns:
@@ -1875,7 +1877,12 @@ struct smaprec {
         unsigned long stack;
         unsigned long smap_pss, smap_swap;
         unsigned long smap_size;
-        unsigned long smap_start;
+        // For mixed 32/64 userspace, 32-bit pmap still needs
+        // 64-bit field here to correctly show 64-bit processes:
+        unsigned long long smap_start;
+        // (strictly speaking, other fields need to be wider too,
+        // but they are in kbytes, not bytes, and they hold sizes,
+        // not start addresses, sizes tend to be less than 4 terabytes)
         char smap_mode[5];
         char *smap_name;
 };
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 373cde2d8..4377d90e3 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -23,7 +23,7 @@
 //config:       help
 //config:       Create extended header file compatible with "big" bootchartd.
 //config:       "Big" bootchartd is a shell script and it dumps some
-//config:       "convenient" info int the header, such as:
+//config:       "convenient" info into the header, such as:
 //config:               title = Boot chart for `hostname` (`date`)
 //config:               system.uname = `uname -srvm`
 //config:               system.release = `cat /etc/DISTRO-release`
diff --git a/init/halt.c b/init/halt.c
index e6dcb1c67..785c38130 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -7,19 +7,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config HALT
-//config:       bool "halt (3.7 kb)"
+//config:       bool "halt (4 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and halt the system.
 //config:
 //config:config POWEROFF
-//config:       bool "poweroff (3.7 kb)"
+//config:       bool "poweroff (4 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and power off the system.
 //config:
 //config:config REBOOT
-//config:       bool "reboot (3.7 kb)"
+//config:       bool "reboot (4 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and reboot the system.
diff --git a/init/init.c b/init/init.c
index fde35f6b6..87086b48b 100644
--- a/init/init.c
+++ b/init/init.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config INIT
-//config:       bool "init (9.3 kb)"
+//config:       bool "init (10 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/klibc-utils/nuke.c b/klibc-utils/nuke.c
index 60a5f7145..d7c16f5cf 100644
--- a/klibc-utils/nuke.c
+++ b/klibc-utils/nuke.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NUKE
-//config:       bool "nuke (2.4 kb)"
+//config:       bool "nuke (2.9 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "rm -rf".
diff --git a/klibc-utils/resume.c b/klibc-utils/resume.c
index 3424f076b..2bf50f9b8 100644
--- a/klibc-utils/resume.c
+++ b/klibc-utils/resume.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config RESUME
-//config:       bool "resume (3.3 kb)"
+//config:       bool "resume (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       Resume from saved "suspend-to-disk" image
diff --git a/klibc-utils/run-init.c b/klibc-utils/run-init.c
index 61c16fd0b..77fc0e60c 100644
--- a/klibc-utils/run-init.c
+++ b/klibc-utils/run-init.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config RUN_INIT
-//config:       bool "run-init (7.5 kb)"
+//config:       bool "run-init (7.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3ff2b5dc6..8efb1754a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -134,16 +134,16 @@ void FAST_FUNC bb_show_usage(void)
 {
         if (ENABLE_SHOW_USAGE) {
 #ifdef SINGLE_APPLET_STR
-                /* Imagine that this applet is "true". Dont suck in printf! */
+                /* Imagine that this applet is "true". Dont link in printf! */
                 const char *usage_string = unpack_usage_messages();
 
                 if (usage_string) {
                         if (*usage_string == '\b') {
-                                full_write2_str("No help available.\n\n");
+                                full_write2_str("No help available\n");
                         } else {
                                 full_write2_str("Usage: "SINGLE_APPLET_STR" ");
                                 full_write2_str(usage_string);
-                                full_write2_str("\n\n");
+                                full_write2_str("\n");
                         }
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 dealloc_usage_messages((char*)usage_string);
@@ -162,7 +162,7 @@ void FAST_FUNC bb_show_usage(void)
                 full_write2_str(bb_banner);
                 full_write2_str(" multi-call binary\n");
                 if (*p == '\b')
-                        full_write2_str("\nNo help available.\n\n");
+                        full_write2_str("\nNo help available\n");
                 else {
                         full_write2_str("\nUsage: ");
                         full_write2_str(applet_name);
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 11a77ec69..0b4e326d8 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1444,6 +1444,16 @@ void FAST_FUNC show_history(const line_input_t *st)
                 printf("%4d %s\n", i, st->history[i]);
 }
 
+void FAST_FUNC free_line_input_t(line_input_t *n)
+{
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
+        int i = n->cnt_history;
+        while (i > 0)
+                free(n->history[--i]);
+#endif
+        free(n);
+}
+
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
 /* We try to ensure that concurrent additions to the history
  * do not overwrite each other.
@@ -1453,14 +1463,6 @@ void FAST_FUNC show_history(const line_input_t *st)
  * than configured MAX_HISTORY lines.
  */
 
-static void free_line_input_t(line_input_t *n)
-{
-        int i = n->cnt_history;
-        while (i > 0)
-                free(n->history[--i]);
-        free(n);
-}
-
 /* state->flags is already checked to be nonzero */
 static void load_history(line_input_t *st_parm)
 {
@@ -2380,6 +2382,18 @@ static int32_t reverse_i_search(int timeout)
 }
 #endif
 
+#if ENABLE_FEATURE_EDITING_WINCH
+static void sigaction2(int sig, struct sigaction *act)
+{
+        // Grr... gcc 8.1.1:
+        // "passing argument 3 to restrict-qualified parameter aliases with argument 2"
+        // dance around that...
+        struct sigaction *oact FIX_ALIASING;
+        oact = act;
+        sigaction(sig, act, oact);
+}
+#endif
+
 /* maxsize must be >= 2.
  * Returns:
  * -1 on read errors or EOF, or on bare Ctrl-D,
@@ -2500,7 +2514,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         /* Install window resize handler (NB: after *all* init is complete) */
         S.SIGWINCH_handler.sa_handler = win_changed;
         S.SIGWINCH_handler.sa_flags = SA_RESTART;
-        sigaction(SIGWINCH, &S.SIGWINCH_handler, &S.SIGWINCH_handler);
+        sigaction2(SIGWINCH, &S.SIGWINCH_handler);
 #endif
         read_key_buffer[0] = 0;
         while (1) {
diff --git a/libbb/procps.c b/libbb/procps.c
index 2484ab2d9..e6892d7ff 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -121,11 +121,11 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp)
 }
 
 #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
-static unsigned long fast_strtoul_16(char **endptr)
+static unsigned long long fast_strtoull_16(char **endptr)
 {
         unsigned char c;
         char *str = *endptr;
-        unsigned long n = 0;
+        unsigned long long n = 0;
 
         /* Need to stop on both ' ' and '\n' */
         while ((c = *str++) > ' ') {
@@ -239,8 +239,8 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
 
                         *tp = ' ';
                         tp = buf;
-                        currec.smap_start = fast_strtoul_16(&tp);
-                        currec.smap_size = (fast_strtoul_16(&tp) - currec.smap_start) >> 10;
+                        currec.smap_start = fast_strtoull_16(&tp);
+                        currec.smap_size = (fast_strtoull_16(&tp) - currec.smap_start) >> 10;
 
                         strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
 
diff --git a/libbb/signals.c b/libbb/signals.c
index 3f589321c..d3d84ef6a 100644
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -31,6 +31,16 @@ int FAST_FUNC sigprocmask_allsigs(int how)
         return sigprocmask(how, &set, NULL);
 }
 
+int FAST_FUNC sigprocmask2(int how, sigset_t *set)
+{
+        // Grr... gcc 8.1.1:
+        // "passing argument 3 to restrict-qualified parameter aliases with argument 2"
+        // dance around that...
+        sigset_t *oset FIX_ALIASING;
+        oset = set;
+        return sigprocmask(how, set, oset);
+}
+
 void FAST_FUNC bb_signals(int sigs, void (*f)(int))
 {
         int sig_no = 0;
diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c
index 6d03de254..b09555aae 100644
--- a/loginutils/add-remove-shell.c
+++ b/loginutils/add-remove-shell.c
@@ -8,13 +8,13 @@
  * for details.
  */
 //config:config ADD_SHELL
-//config:       bool "add-shell (2.8 kb)"
+//config:       bool "add-shell (3.1 kb)"
 //config:       default y if DESKTOP
 //config:       help
 //config:       Add shells to /etc/shells.
 //config:
 //config:config REMOVE_SHELL
-//config:       bool "remove-shell (2.7 kb)"
+//config:       bool "remove-shell (3 kb)"
 //config:       default y if DESKTOP
 //config:       help
 //config:       Remove shells from /etc/shells.
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 6839eafbd..baa961ff3 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADDGROUP
-//config:       bool "addgroup (8.2 kb)"
+//config:       bool "addgroup (8.6 kb)"
 //config:       default y
 //config:       select LONG_OPTS
 //config:       help
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 5ee22d4f1..d7e9327ba 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -9,13 +9,13 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config DELUSER
-//config:       bool "deluser (8.4 kb)"
+//config:       bool "deluser (9.1 kb)"
 //config:       default y
 //config:       help
 //config:       Utility for deleting a user account.
 //config:
 //config:config DELGROUP
-//config:       bool "delgroup (5.6 kb)"
+//config:       bool "delgroup (6.4 kb)"
 //config:       default y
 //config:       help
 //config:       Utility for deleting a group account.
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 59f47fc7b..30e096460 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -43,7 +43,7 @@
 static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo)
 {
         char salt[MAX_PW_SALT_LEN];
-        char *orig = (char*)"";
+        char *orig = NULL;
         char *newp = NULL;
         char *cp = NULL;
         char *ret = NULL; /* failure so far */
@@ -51,7 +51,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
         if (myuid != 0 && pw->pw_passwd[0]) {
                 char *encrypted;
 
-                orig = bb_ask_noecho_stdin("Old password: "); /* returns ptr to static */
+                orig = bb_ask_noecho_stdin("Old password: "); /* returns malloced str */
                 if (!orig)
                         goto err_ret;
                 encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
@@ -64,11 +64,11 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
                 if (ENABLE_FEATURE_CLEAN_UP)
                         free(encrypted);
         }
-        newp = bb_ask_noecho_stdin("New password: "); /* returns ptr to static */
+        newp = bb_ask_noecho_stdin("New password: "); /* returns malloced str */
         if (!newp)
                 goto err_ret;
         if (ENABLE_FEATURE_PASSWD_WEAK_CHECK
-         && obscure(orig, newp, pw)
+         && obscure(orig, newp, pw) /* NB: passing NULL orig is ok */
          && myuid != 0
         ) {
                 goto err_ret; /* non-root is not allowed to have weak passwd */
diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 7539d5134..53a1820f1 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MAKEMIME
-//config:       bool "makemime (5.9 kb)"
+//config:       bool "makemime (5.4 kb)"
 //config:       default y
 //config:       help
 //config:       Create MIME-formatted messages.
diff --git a/make_single_applets.sh b/make_single_applets.sh
index aa1ace265..a37168cdf 100755
--- a/make_single_applets.sh
+++ b/make_single_applets.sh
@@ -27,6 +27,8 @@ allno="$cfg"
 for app in $apps; do
         allno="`echo "$allno" | sed "s/^CONFIG_${app}=y\$/# CONFIG_${app} is not set/"`"
 done
+# remove "busybox" as well
+allno="`echo "$allno" | sed "s/^CONFIG_BUSYBOX=y\$/# CONFIG_BUSYBOX is not set/"`"
 #echo "$allno" >.config_allno
 
 trap 'test -f .config.SV && mv .config.SV .config && touch .config' EXIT
@@ -70,6 +72,16 @@ for app; do
                 echo "NUM_APPLETS != 1 for ${app}: `cat include/NUM_APPLETS.h`"
                 mv .config busybox_config_${app}
         else
+                if grep -q 'use larger COMMON_BUFSIZE' busybox_make_${app}.log; then
+                        # FEATURE_USE_BSS_TAIL=y is selected, and build system
+                        # recommends rebuilding. Do so, and print some
+                        # debug info to see whether it works right:
+                        tail -n1 busybox_make_${app}.log
+                        nm busybox_unstripped | grep ' _end'
+                        make >/dev/null 2>&1
+                        nm busybox_unstripped | grep ' _end'
+                        grep ^bb_common_bufsiz1 busybox_unstripped.map
+                fi
                 grep -i -e error: -e warning: busybox_make_${app}.log \
                 || rm busybox_make_${app}.log
                 mv busybox busybox_${app}
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index c1718e909..8ca90d58a 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADJTIMEX
-//config:       bool "adjtimex (4.5 kb)"
+//config:       bool "adjtimex (4.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/bc.c b/miscutils/bc.c
new file mode 100644
index 000000000..7fecb264d
--- /dev/null
+++ b/miscutils/bc.c
@@ -0,0 +1,7405 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ * Adapted from https://github.com/gavinhoward/bc
+ * Original code copyright (c) 2018 Gavin D. Howard and contributors.
+ */
+//TODO: GNU extensions:
+// support "define f(*param[])" - "pass array by reference" syntax
+
+#define DEBUG_LEXER   0
+#define DEBUG_COMPILE 0
+#define DEBUG_EXEC    0
+// This can be left enabled for production as well:
+#define SANITY_CHECKS 1
+
+//config:config BC
+//config:       bool "bc (45 kb)"
+//config:       default y
+//config:       select FEATURE_DC_BIG
+//config:       help
+//config:       bc is a command-line, arbitrary-precision calculator with a
+//config:       Turing-complete language. See the GNU bc manual
+//config:       (https://www.gnu.org/software/bc/manual/bc.html) and bc spec
+//config:       (http://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html).
+//config:
+//config:       This bc has five differences to the GNU bc:
+//config:         1) The period (.) is a shortcut for "last", as in the BSD bc.
+//config:         2) Arrays are copied before being passed as arguments to
+//config:            functions. This behavior is required by the bc spec.
+//config:         3) Arrays can be passed to the builtin "length" function to get
+//config:            the number of elements in the array. This prints "1":
+//config:               a[0] = 0; length(a[])
+//config:         4) The precedence of the boolean "not" operator (!) is equal to
+//config:            that of the unary minus (-) negation operator. This still
+//config:            allows POSIX-compliant scripts to work while somewhat
+//config:            preserving expected behavior (versus C) and making parsing
+//config:            easier.
+//config:         5) "read()" accepts expressions, not only numeric literals.
+//config:
+//config:config DC
+//config:       bool "dc (36 kb)"
+//config:       default y
+//config:       help
+//config:       dc is a reverse-polish notation command-line calculator which
+//config:       supports unlimited precision arithmetic. See the FreeBSD man page
+//config:       (https://www.unix.com/man-page/FreeBSD/1/dc/) and GNU dc manual
+//config:       (https://www.gnu.org/software/bc/manual/dc-1.05/html_mono/dc.html).
+//config:
+//config:       This dc has a few differences from the two above:
+//config:         1) When printing a byte stream (command "P"), this dc follows what
+//config:            the FreeBSD dc does.
+//config:         2) Implements the GNU extensions for divmod ("~") and
+//config:            modular exponentiation ("|").
+//config:         3) Implements all FreeBSD extensions, except for "J" and "M".
+//config:         4) Like the FreeBSD dc, this dc supports extended registers.
+//config:            However, they are implemented differently. When it encounters
+//config:            whitespace where a register should be, it skips the whitespace.
+//config:            If the character following is not a lowercase letter, an error
+//config:            is issued. Otherwise, the register name is parsed by the
+//config:            following regex: [a-z][a-z0-9_]*
+//config:            This generally means that register names will be surrounded by
+//config:            whitespace. Examples:
+//config:               l idx s temp L index S temp2 < do_thing
+//config:            Also note that, like the FreeBSD dc, extended registers are not
+//config:            allowed unless the "-x" option is given.
+//config:
+//config:if BC || DC  # for menuconfig indenting
+//config:
+//config:config FEATURE_DC_BIG
+//config:       bool "Use bc code base for dc (larger, more features)"
+//config:       default y
+//config:
+//config:config FEATURE_DC_LIBM
+//config:       bool "Enable power and exp functions (requires libm)"
+//config:       default y
+//config:       depends on DC && !BC && !FEATURE_DC_BIG
+//config:       help
+//config:       Enable power and exp functions.
+//config:       NOTE: This will require libm to be present for linking.
+//config:
+//config:config FEATURE_BC_INTERACTIVE
+//config:       bool "Interactive mode (+4kb)"
+//config:       default y
+//config:       depends on BC || (DC && FEATURE_DC_BIG)
+//config:       help
+//config:       Enable interactive mode: when started on a tty,
+//config:       ^C interrupts execution and returns to command line,
+//config:       errors also return to command line instead of exiting,
+//config:       line editing with history is available.
+//config:
+//config:       With this option off, input can still be taken from tty,
+//config:       but all errors are fatal, ^C is fatal,
+//config:       tty is treated exactly the same as any other
+//config:       standard input (IOW: no line editing).
+//config:
+//config:config FEATURE_BC_LONG_OPTIONS
+//config:       bool "Enable bc/dc long options"
+//config:       default y
+//config:       depends on BC || (DC && FEATURE_DC_BIG)
+//config:
+//config:endif
+
+//applet:IF_BC(APPLET(bc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_BC) += bc.o
+//kbuild:lib-$(CONFIG_DC) += bc.o
+
+//See www.gnu.org/software/bc/manual/bc.html
+//usage:#define bc_trivial_usage
+//usage:       "[-sqlw] FILE..."
+//usage:
+//usage:#define bc_full_usage "\n"
+//usage:     "\nArbitrary precision calculator"
+//usage:     "\n"
+///////:     "\n        -i      Interactive" - has no effect for now
+//usage:     "\n        -q      Quiet"
+//usage:     "\n        -l      Load standard math library"
+//usage:     "\n        -s      Be POSIX compatible"
+//usage:     "\n        -w      Warn if extensions are used"
+///////:     "\n        -v      Version"
+//usage:     "\n"
+//usage:     "\n$BC_LINE_LENGTH changes output width"
+//usage:
+//usage:#define bc_example_usage
+//usage:       "3 + 4.129\n"
+//usage:       "1903 - 2893\n"
+//usage:       "-129 * 213.28935\n"
+//usage:       "12 / -1932\n"
+//usage:       "12 % 12\n"
+//usage:       "34 ^ 189\n"
+//usage:       "scale = 13\n"
+//usage:       "ibase = 2\n"
+//usage:       "obase = A\n"
+//usage:
+//usage:#define dc_trivial_usage
+//usage:       IF_FEATURE_DC_BIG("[-x] ")"[-eSCRIPT]... [-fFILE]... [FILE]..."
+//usage:
+//usage:#define dc_full_usage "\n"
+//usage:     "\nTiny RPN calculator. Operations:"
+//usage:     "\n+, -, *, /, %, ~, ^," IF_FEATURE_DC_BIG(" |,")
+//usage:     "\np - print top of the stack without popping"
+//usage:     "\nf - print entire stack"
+//usage:     "\nk - pop the value and set the precision"
+//usage:     "\ni - pop the value and set input radix"
+//usage:     "\no - pop the value and set output radix"
+//usage:     "\nExamples: dc -e'2 2 + p' -> 4, dc -e'8 8 * 2 2 + / p' -> 16"
+//usage:
+//usage:#define dc_example_usage
+//usage:       "$ dc -e'2 2 + p'\n"
+//usage:       "4\n"
+//usage:       "$ dc -e'8 8 \\* 2 2 + / p'\n"
+//usage:       "16\n"
+//usage:       "$ dc -e'0 1 & p'\n"
+//usage:       "0\n"
+//usage:       "$ dc -e'0 1 | p'\n"
+//usage:       "1\n"
+//usage:       "$ echo '72 9 / 8 * p' | dc\n"
+//usage:       "64\n"
+
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+#if !ENABLE_BC && !ENABLE_FEATURE_DC_BIG
+# include "dc.c"
+#else
+
+#if DEBUG_LEXER
+static uint8_t lex_indent;
+#define dbg_lex(...) \
+        do { \
+                fprintf(stderr, "%*s", lex_indent, ""); \
+                bb_error_msg(__VA_ARGS__); \
+        } while (0)
+#define dbg_lex_enter(...) \
+        do { \
+                dbg_lex(__VA_ARGS__); \
+                lex_indent++; \
+        } while (0)
+#define dbg_lex_done(...) \
+        do { \
+                lex_indent--; \
+                dbg_lex(__VA_ARGS__); \
+        } while (0)
+#else
+# define dbg_lex(...)       ((void)0)
+# define dbg_lex_enter(...) ((void)0)
+# define dbg_lex_done(...)  ((void)0)
+#endif
+
+#if DEBUG_COMPILE
+# define dbg_compile(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg_compile(...) ((void)0)
+#endif
+
+#if DEBUG_EXEC
+# define dbg_exec(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg_exec(...) ((void)0)
+#endif
+
+typedef enum BcStatus {
+        BC_STATUS_SUCCESS = 0,
+        BC_STATUS_FAILURE = 1,
+} BcStatus;
+
+#define BC_VEC_INVALID_IDX  ((size_t) -1)
+#define BC_VEC_START_CAP    (1 << 5)
+
+typedef void (*BcVecFree)(void *) FAST_FUNC;
+
+typedef struct BcVec {
+        char *v;
+        size_t len;
+        size_t cap;
+        size_t size;
+        BcVecFree dtor;
+} BcVec;
+
+typedef signed char BcDig;
+
+typedef struct BcNum {
+        BcDig *restrict num;
+        size_t rdx;
+        size_t len;
+        size_t cap;
+        bool neg;
+} BcNum;
+
+#define BC_NUM_MAX_IBASE        36
+// larger value might speed up BIGNUM calculations a bit:
+#define BC_NUM_DEF_SIZE         16
+#define BC_NUM_PRINT_WIDTH      69
+
+#define BC_NUM_KARATSUBA_LEN    32
+
+typedef enum BcInst {
+#if ENABLE_BC
+        BC_INST_INC_PRE,
+        BC_INST_DEC_PRE,
+        BC_INST_INC_POST,
+        BC_INST_DEC_POST,
+#endif
+        XC_INST_NEG,            // order
+
+        XC_INST_REL_EQ,         // should
+        XC_INST_REL_LE,         // match
+        XC_INST_REL_GE,         // LEX
+        XC_INST_REL_NE,         // constants
+        XC_INST_REL_LT,         // for
+        XC_INST_REL_GT,         // these
+
+        XC_INST_POWER,          // operations
+        XC_INST_MULTIPLY,       // |
+        XC_INST_DIVIDE,         // |
+        XC_INST_MODULUS,        // |
+        XC_INST_PLUS,           // |
+        XC_INST_MINUS,          // |
+
+        XC_INST_BOOL_NOT,       // |
+        XC_INST_BOOL_OR,        // |
+        XC_INST_BOOL_AND,       // |
+#if ENABLE_BC
+        BC_INST_ASSIGN_POWER,   // |
+        BC_INST_ASSIGN_MULTIPLY,// |
+        BC_INST_ASSIGN_DIVIDE,  // |
+        BC_INST_ASSIGN_MODULUS, // |
+        BC_INST_ASSIGN_PLUS,    // |
+        BC_INST_ASSIGN_MINUS,   // |
+#endif
+        XC_INST_ASSIGN,         // V
+
+        XC_INST_NUM,
+        XC_INST_VAR,
+        XC_INST_ARRAY_ELEM,
+        XC_INST_ARRAY,
+        XC_INST_SCALE_FUNC,
+
+        XC_INST_IBASE,       // order of these constans should match other enums
+        XC_INST_OBASE,       // order of these constans should match other enums
+        XC_INST_SCALE,       // order of these constans should match other enums
+        IF_BC(BC_INST_LAST,) // order of these constans should match other enums
+        XC_INST_LENGTH,
+        XC_INST_READ,
+        XC_INST_SQRT,
+
+        XC_INST_PRINT,
+        XC_INST_PRINT_POP,
+        XC_INST_STR,
+        XC_INST_PRINT_STR,
+
+#if ENABLE_BC
+        BC_INST_HALT,
+        BC_INST_JUMP,
+        BC_INST_JUMP_ZERO,
+
+        BC_INST_CALL,
+        BC_INST_RET0,
+#endif
+        XC_INST_RET,
+
+        XC_INST_POP,
+#if ENABLE_DC
+        DC_INST_POP_EXEC,
+
+        DC_INST_MODEXP,
+        DC_INST_DIVMOD,
+
+        DC_INST_EXECUTE,
+        DC_INST_EXEC_COND,
+
+        DC_INST_ASCIIFY,
+        DC_INST_PRINT_STREAM,
+
+        DC_INST_PRINT_STACK,
+        DC_INST_CLEAR_STACK,
+        DC_INST_STACK_LEN,
+        DC_INST_DUPLICATE,
+        DC_INST_SWAP,
+
+        DC_INST_LOAD,
+        DC_INST_PUSH_VAR,
+        DC_INST_PUSH_TO_VAR,
+
+        DC_INST_QUIT,
+        DC_INST_NQUIT,
+
+        DC_INST_INVALID = -1,
+#endif
+} BcInst;
+
+typedef struct BcId {
+        char *name;
+        size_t idx;
+} BcId;
+
+typedef struct BcFunc {
+        BcVec code;
+        IF_BC(BcVec labels;)
+        IF_BC(BcVec autos;)
+        IF_BC(BcVec strs;)
+        IF_BC(BcVec consts;)
+        IF_BC(size_t nparams;)
+        IF_BC(bool voidfunc;)
+} BcFunc;
+
+typedef enum BcResultType {
+        XC_RESULT_TEMP,
+        IF_BC(BC_RESULT_VOID,) // same as TEMP, but INST_PRINT will ignore it
+
+        XC_RESULT_VAR,
+        XC_RESULT_ARRAY_ELEM,
+        XC_RESULT_ARRAY,
+
+        XC_RESULT_STR,
+
+        //code uses "inst - XC_INST_IBASE + XC_RESULT_IBASE" construct,
+        XC_RESULT_IBASE,       // relative order should match for: XC_INST_IBASE
+        XC_RESULT_OBASE,       // relative order should match for: XC_INST_OBASE
+        XC_RESULT_SCALE,       // relative order should match for: XC_INST_SCALE
+        IF_BC(BC_RESULT_LAST,) // relative order should match for: BC_INST_LAST
+        XC_RESULT_CONSTANT,
+        IF_BC(BC_RESULT_ONE,)
+} BcResultType;
+
+typedef union BcResultData {
+        BcNum n;
+        BcVec v;
+        BcId id;
+} BcResultData;
+
+typedef struct BcResult {
+        BcResultType t;
+        BcResultData d;
+} BcResult;
+
+typedef struct BcInstPtr {
+        size_t func;
+        size_t inst_idx;
+} BcInstPtr;
+
+typedef enum BcLexType {
+        XC_LEX_EOF,
+        XC_LEX_INVALID,
+
+        XC_LEX_NLINE,
+        XC_LEX_WHITESPACE,
+        XC_LEX_STR,
+        XC_LEX_NAME,
+        XC_LEX_NUMBER,
+
+        XC_LEX_1st_op,
+        XC_LEX_NEG = XC_LEX_1st_op,     // order
+
+        XC_LEX_OP_REL_EQ,               // should
+        XC_LEX_OP_REL_LE,               // match
+        XC_LEX_OP_REL_GE,               // INST
+        XC_LEX_OP_REL_NE,               // constants
+        XC_LEX_OP_REL_LT,               // for
+        XC_LEX_OP_REL_GT,               // these
+
+        XC_LEX_OP_POWER,                // operations
+        XC_LEX_OP_MULTIPLY,             // |
+        XC_LEX_OP_DIVIDE,               // |
+        XC_LEX_OP_MODULUS,              // |
+        XC_LEX_OP_PLUS,                 // |
+        XC_LEX_OP_MINUS,                // |
+        XC_LEX_OP_last = XC_LEX_OP_MINUS,
+#if ENABLE_BC
+        BC_LEX_OP_BOOL_NOT,             // |
+        BC_LEX_OP_BOOL_OR,              // |
+        BC_LEX_OP_BOOL_AND,             // |
+
+        BC_LEX_OP_ASSIGN_POWER,         // |
+        BC_LEX_OP_ASSIGN_MULTIPLY,      // |
+        BC_LEX_OP_ASSIGN_DIVIDE,        // |
+        BC_LEX_OP_ASSIGN_MODULUS,       // |
+        BC_LEX_OP_ASSIGN_PLUS,          // |
+        BC_LEX_OP_ASSIGN_MINUS,         // |
+
+        BC_LEX_OP_ASSIGN,               // V
+
+        BC_LEX_OP_INC,
+        BC_LEX_OP_DEC,
+
+        BC_LEX_LPAREN, // () are 0x28 and 0x29
+        BC_LEX_RPAREN, // must be LPAREN+1: code uses (c - '(' + BC_LEX_LPAREN)
+
+        BC_LEX_LBRACKET, // [] are 0x5B and 0x5D
+        BC_LEX_COMMA,
+        BC_LEX_RBRACKET, // must be LBRACKET+2: code uses (c - '[' + BC_LEX_LBRACKET)
+
+        BC_LEX_LBRACE, // {} are 0x7B and 0x7D
+        BC_LEX_SCOLON,
+        BC_LEX_RBRACE, // must be LBRACE+2: code uses (c - '{' + BC_LEX_LBRACE)
+
+        BC_LEX_KEY_1st_keyword,
+        BC_LEX_KEY_AUTO = BC_LEX_KEY_1st_keyword,
+        BC_LEX_KEY_BREAK,
+        BC_LEX_KEY_CONTINUE,
+        BC_LEX_KEY_DEFINE,
+        BC_LEX_KEY_ELSE,
+        BC_LEX_KEY_FOR,
+        BC_LEX_KEY_HALT,
+        // code uses "type - BC_LEX_KEY_IBASE + XC_INST_IBASE" construct,
+        BC_LEX_KEY_IBASE,    // relative order should match for: XC_INST_IBASE
+        BC_LEX_KEY_OBASE,    // relative order should match for: XC_INST_OBASE
+        BC_LEX_KEY_IF,
+        BC_LEX_KEY_LAST,     // relative order should match for: BC_INST_LAST
+        BC_LEX_KEY_LENGTH,
+        BC_LEX_KEY_LIMITS,
+        BC_LEX_KEY_PRINT,
+        BC_LEX_KEY_QUIT,
+        BC_LEX_KEY_READ,
+        BC_LEX_KEY_RETURN,
+        BC_LEX_KEY_SCALE,
+        BC_LEX_KEY_SQRT,
+        BC_LEX_KEY_WHILE,
+#endif // ENABLE_BC
+
+#if ENABLE_DC
+        DC_LEX_OP_BOOL_NOT = XC_LEX_OP_last + 1,
+        DC_LEX_OP_ASSIGN,
+
+        DC_LEX_LPAREN,
+        DC_LEX_SCOLON,
+        DC_LEX_READ,
+        DC_LEX_IBASE,
+        DC_LEX_SCALE,
+        DC_LEX_OBASE,
+        DC_LEX_LENGTH,
+        DC_LEX_PRINT,
+        DC_LEX_QUIT,
+        DC_LEX_SQRT,
+        DC_LEX_LBRACE,
+
+        DC_LEX_EQ_NO_REG,
+        DC_LEX_OP_MODEXP,
+        DC_LEX_OP_DIVMOD,
+
+        DC_LEX_COLON,
+        DC_LEX_ELSE,
+        DC_LEX_EXECUTE,
+        DC_LEX_PRINT_STACK,
+        DC_LEX_CLEAR_STACK,
+        DC_LEX_STACK_LEVEL,
+        DC_LEX_DUPLICATE,
+        DC_LEX_SWAP,
+        DC_LEX_POP,
+
+        DC_LEX_ASCIIFY,
+        DC_LEX_PRINT_STREAM,
+
+        // code uses "t - DC_LEX_STORE_IBASE + XC_INST_IBASE" construct,
+        DC_LEX_STORE_IBASE,  // relative order should match for: XC_INST_IBASE
+        DC_LEX_STORE_OBASE,  // relative order should match for: XC_INST_OBASE
+        DC_LEX_STORE_SCALE,  // relative order should match for: XC_INST_SCALE
+        DC_LEX_LOAD,
+        DC_LEX_LOAD_POP,
+        DC_LEX_STORE_PUSH,
+        DC_LEX_PRINT_POP,
+        DC_LEX_NQUIT,
+        DC_LEX_SCALE_FACTOR,
+#endif
+} BcLexType;
+// must match order of BC_LEX_KEY_foo etc above
+#if ENABLE_BC
+struct BcLexKeyword {
+        char name8[8];
+};
+#define LEX_KW_ENTRY(a, b) \
+        { .name8 = a /*, .posix = b */ }
+static const struct BcLexKeyword bc_lex_kws[20] = {
+        LEX_KW_ENTRY("auto"    , 1), // 0
+        LEX_KW_ENTRY("break"   , 1), // 1
+        LEX_KW_ENTRY("continue", 0), // 2 note: this one has no terminating NUL
+        LEX_KW_ENTRY("define"  , 1), // 3
+        LEX_KW_ENTRY("else"    , 0), // 4
+        LEX_KW_ENTRY("for"     , 1), // 5
+        LEX_KW_ENTRY("halt"    , 0), // 6
+        LEX_KW_ENTRY("ibase"   , 1), // 7
+        LEX_KW_ENTRY("obase"   , 1), // 8
+        LEX_KW_ENTRY("if"      , 1), // 9
+        LEX_KW_ENTRY("last"    , 0), // 10
+        LEX_KW_ENTRY("length"  , 1), // 11
+        LEX_KW_ENTRY("limits"  , 0), // 12
+        LEX_KW_ENTRY("print"   , 0), // 13
+        LEX_KW_ENTRY("quit"    , 1), // 14
+        LEX_KW_ENTRY("read"    , 0), // 15
+        LEX_KW_ENTRY("return"  , 1), // 16
+        LEX_KW_ENTRY("scale"   , 1), // 17
+        LEX_KW_ENTRY("sqrt"    , 1), // 18
+        LEX_KW_ENTRY("while"   , 1), // 19
+};
+#undef LEX_KW_ENTRY
+#define STRING_else  (bc_lex_kws[4].name8)
+#define STRING_for   (bc_lex_kws[5].name8)
+#define STRING_if    (bc_lex_kws[9].name8)
+#define STRING_while (bc_lex_kws[19].name8)
+enum {
+        POSIX_KWORD_MASK = 0
+                | (1 << 0)  // 0
+                | (1 << 1)  // 1
+                | (0 << 2)  // 2
+                | (1 << 3)  // 3
+                | (0 << 4)  // 4
+                | (1 << 5)  // 5
+                | (0 << 6)  // 6
+                | (1 << 7)  // 7
+                | (1 << 8)  // 8
+                | (1 << 9)  // 9
+                | (0 << 10) // 10
+                | (1 << 11) // 11
+                | (0 << 12) // 12
+                | (0 << 13) // 13
+                | (1 << 14) // 14
+                | (0 << 15) // 15
+                | (1 << 16) // 16
+                | (1 << 17) // 17
+                | (1 << 18) // 18
+                | (1 << 19) // 19
+};
+#define keyword_is_POSIX(i) ((1 << (i)) & POSIX_KWORD_MASK)
+
+// This is a bit array that corresponds to token types. An entry is
+// true if the token is valid in an expression, false otherwise.
+// Used to figure out when expr parsing should stop *without error message*
+// - 0 element indicates this condition. 1 means "this token is to be eaten
+// as part of the expression", it can then still be determined to be invalid
+// by later processing.
+enum {
+#define EXBITS(a,b,c,d,e,f,g,h) \
+        ((uint64_t)((a << 0)+(b << 1)+(c << 2)+(d << 3)+(e << 4)+(f << 5)+(g << 6)+(h << 7)))
+        BC_PARSE_EXPRS_BITS = 0              // corresponding BC_LEX_xyz:
+        + (EXBITS(0,0,0,0,0,1,1,1) << (0*8)) //  0: EOF    INVAL  NL     WS     STR    NAME   NUM    -
+        + (EXBITS(1,1,1,1,1,1,1,1) << (1*8)) //  8: ==     <=     >=     !=     <      >      ^      *
+        + (EXBITS(1,1,1,1,1,1,1,1) << (2*8)) // 16: /      %      +      -      !      ||     &&     ^=
+        + (EXBITS(1,1,1,1,1,1,1,1) << (3*8)) // 24: *=     /=     %=     +=     -=     =      ++     --
+        + (EXBITS(1,1,0,0,0,0,0,0) << (4*8)) // 32: (      )      [      ,      ]      {      ;      }
+        + (EXBITS(0,0,0,0,0,0,0,1) << (5*8)) // 40: auto   break  cont   define else   for    halt   ibase
+        + (EXBITS(1,0,1,1,0,0,0,1) << (6*8)) // 48: obase  if     last   length limits print  quit   read
+        + (EXBITS(0,1,1,0,0,0,0,0) << (7*8)) // 56: return scale  sqrt   while
+#undef EXBITS
+};
+static ALWAYS_INLINE long lex_allowed_in_bc_expr(unsigned i)
+{
+#if ULONG_MAX > 0xffffffff
+        // 64-bit version (will not work correctly for 32-bit longs!)
+        return BC_PARSE_EXPRS_BITS & (1UL << i);
+#else
+        // 32-bit version
+        unsigned long m = (uint32_t)BC_PARSE_EXPRS_BITS;
+        if (i >= 32) {
+                m = (uint32_t)(BC_PARSE_EXPRS_BITS >> 32);
+                i &= 31;
+        }
+        return m & (1UL << i);
+#endif
+}
+
+// This is an array of data for operators that correspond to
+// [XC_LEX_1st_op...] token types.
+static const uint8_t bc_ops_prec_and_assoc[] ALIGN1 = {
+#define OP(p,l) ((int)(l) * 0x10 + (p))
+        OP(1, false), // neg
+        OP(6, true ), OP( 6, true  ), OP( 6, true  ), OP( 6, true  ), OP( 6, true  ), OP( 6, true ), // == <= >= != < >
+        OP(2, false), // pow
+        OP(3, true ), OP( 3, true  ), OP( 3, true  ), // mul div mod
+        OP(4, true ), OP( 4, true  ), // + -
+        OP(1, false), // not
+        OP(7, true ), OP( 7, true  ), // or and
+        OP(5, false), OP( 5, false ), OP( 5, false ), OP( 5, false ), OP( 5, false ), // ^= *= /= %= +=
+        OP(5, false), OP( 5, false ), // -= =
+        OP(0, false), OP( 0, false ), // inc dec
+#undef OP
+};
+#define bc_operation_PREC(i) (bc_ops_prec_and_assoc[i] & 0x0f)
+#define bc_operation_LEFT(i) (bc_ops_prec_and_assoc[i] & 0x10)
+#endif // ENABLE_BC
+
+#if ENABLE_DC
+static const //BcLexType - should be this type
+uint8_t
+dc_char_to_LEX[] ALIGN1 = {
+        // %&'(
+        XC_LEX_OP_MODULUS, XC_LEX_INVALID, XC_LEX_INVALID, DC_LEX_LPAREN,
+        // )*+,
+        XC_LEX_INVALID, XC_LEX_OP_MULTIPLY, XC_LEX_OP_PLUS, XC_LEX_INVALID,
+        // -./
+        XC_LEX_OP_MINUS, XC_LEX_INVALID, XC_LEX_OP_DIVIDE,
+        // 0123456789
+        XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID,
+        XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID,
+        XC_LEX_INVALID, XC_LEX_INVALID,
+        // :;<=>?@
+        DC_LEX_COLON, DC_LEX_SCOLON, XC_LEX_OP_REL_GT, XC_LEX_OP_REL_EQ,
+        XC_LEX_OP_REL_LT, DC_LEX_READ, XC_LEX_INVALID,
+        // ABCDEFGH
+        XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID,
+        XC_LEX_INVALID, XC_LEX_INVALID, DC_LEX_EQ_NO_REG, XC_LEX_INVALID,
+        // IJKLMNOP
+        DC_LEX_IBASE, XC_LEX_INVALID, DC_LEX_SCALE, DC_LEX_LOAD_POP,
+        XC_LEX_INVALID, DC_LEX_OP_BOOL_NOT, DC_LEX_OBASE, DC_LEX_PRINT_STREAM,
+        // QRSTUVWX
+        DC_LEX_NQUIT, DC_LEX_POP, DC_LEX_STORE_PUSH, XC_LEX_INVALID,
+        XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID, DC_LEX_SCALE_FACTOR,
+        // YZ
+        XC_LEX_INVALID, DC_LEX_LENGTH,
+        // [\]
+        XC_LEX_INVALID, XC_LEX_INVALID, XC_LEX_INVALID,
+        // ^_`
+        XC_LEX_OP_POWER, XC_LEX_NEG, XC_LEX_INVALID,
+        // abcdefgh
+        DC_LEX_ASCIIFY, XC_LEX_INVALID, DC_LEX_CLEAR_STACK, DC_LEX_DUPLICATE,
+        DC_LEX_ELSE, DC_LEX_PRINT_STACK, XC_LEX_INVALID, XC_LEX_INVALID,
+        // ijklmnop
+        DC_LEX_STORE_IBASE, XC_LEX_INVALID, DC_LEX_STORE_SCALE, DC_LEX_LOAD,
+        XC_LEX_INVALID, DC_LEX_PRINT_POP, DC_LEX_STORE_OBASE, DC_LEX_PRINT,
+        // qrstuvwx
+        DC_LEX_QUIT, DC_LEX_SWAP, DC_LEX_OP_ASSIGN, XC_LEX_INVALID,
+        XC_LEX_INVALID, DC_LEX_SQRT, XC_LEX_INVALID, DC_LEX_EXECUTE,
+        // yz
+        XC_LEX_INVALID, DC_LEX_STACK_LEVEL,
+        // {|}~
+        DC_LEX_LBRACE, DC_LEX_OP_MODEXP, XC_LEX_INVALID, DC_LEX_OP_DIVMOD,
+};
+static const //BcInst - should be this type. Using signed narrow type since DC_INST_INVALID is -1
+int8_t
+dc_LEX_to_INST[] ALIGN1 = { //starts at XC_LEX_OP_POWER // corresponding XC/DC_LEX_xyz:
+        XC_INST_POWER,       XC_INST_MULTIPLY,          // XC_LEX_OP_POWER    XC_LEX_OP_MULTIPLY
+        XC_INST_DIVIDE,      XC_INST_MODULUS,           // XC_LEX_OP_DIVIDE   XC_LEX_OP_MODULUS
+        XC_INST_PLUS,        XC_INST_MINUS,             // XC_LEX_OP_PLUS     XC_LEX_OP_MINUS
+        XC_INST_BOOL_NOT,                               // DC_LEX_OP_BOOL_NOT
+        DC_INST_INVALID,                                // DC_LEX_OP_ASSIGN
+        XC_INST_REL_GT,                                 // DC_LEX_LPAREN
+        DC_INST_INVALID,                                // DC_LEX_SCOLON
+        DC_INST_INVALID,                                // DC_LEX_READ
+        XC_INST_IBASE,                                  // DC_LEX_IBASE
+        XC_INST_SCALE,                                  // DC_LEX_SCALE
+        XC_INST_OBASE,                                  // DC_LEX_OBASE
+        XC_INST_LENGTH,                                 // DC_LEX_LENGTH
+        XC_INST_PRINT,                                  // DC_LEX_PRINT
+        DC_INST_QUIT,                                   // DC_LEX_QUIT
+        XC_INST_SQRT,                                   // DC_LEX_SQRT
+        XC_INST_REL_GE,                                 // DC_LEX_LBRACE
+        XC_INST_REL_EQ,                                 // DC_LEX_EQ_NO_REG
+        DC_INST_MODEXP,      DC_INST_DIVMOD,            // DC_LEX_OP_MODEXP   DC_LEX_OP_DIVMOD
+        DC_INST_INVALID,     DC_INST_INVALID,           // DC_LEX_COLON       DC_LEX_ELSE
+        DC_INST_EXECUTE,                                // DC_LEX_EXECUTE
+        DC_INST_PRINT_STACK, DC_INST_CLEAR_STACK,       // DC_LEX_PRINT_STACK DC_LEX_CLEAR_STACK
+        DC_INST_STACK_LEN,   DC_INST_DUPLICATE,         // DC_LEX_STACK_LEVEL DC_LEX_DUPLICATE
+        DC_INST_SWAP,        XC_INST_POP,               // DC_LEX_SWAP        DC_LEX_POP
+        DC_INST_ASCIIFY,     DC_INST_PRINT_STREAM,      // DC_LEX_ASCIIFY     DC_LEX_PRINT_STREAM
+        DC_INST_INVALID,     DC_INST_INVALID,           // DC_LEX_STORE_IBASE DC_LEX_STORE_OBASE
+        DC_INST_INVALID,     DC_INST_INVALID,           // DC_LEX_STORE_SCALE DC_LEX_LOAD
+        DC_INST_INVALID,     DC_INST_INVALID,           // DC_LEX_LOAD_POP    DC_LEX_STORE_PUSH
+        XC_INST_PRINT,       DC_INST_NQUIT,             // DC_LEX_PRINT_POP   DC_LEX_NQUIT
+        XC_INST_SCALE_FUNC,                             // DC_LEX_SCALE_FACTOR
+        // DC_INST_INVALID in this table either means that corresponding LEX
+        // is not possible for dc, or that it does not compile one-to-one
+        // to a single INST.
+};
+#endif // ENABLE_DC
+
+typedef struct BcParse {
+        smallint lex;      // was BcLexType // first member is most used
+        smallint lex_last; // was BcLexType
+        size_t lex_line;
+        const char *lex_inbuf;
+        const char *lex_next_at; // last lex_next() was called at this string
+        const char *lex_filename;
+        FILE *lex_input_fp;
+        BcVec  lex_strnumbuf;
+
+        BcFunc *func;
+        size_t fidx;
+        IF_BC(size_t in_funcdef;)
+        IF_BC(BcVec exits;)
+        IF_BC(BcVec conds;)
+        IF_BC(BcVec ops;)
+} BcParse;
+
+typedef struct BcProgram {
+        size_t len;
+        size_t nchars;
+
+        size_t scale;
+        size_t ib_t;
+        size_t ob_t;
+
+        BcVec results;
+        BcVec exestack;
+
+        BcVec fns;
+        IF_BC(BcVec fn_map;)
+
+        BcVec vars;
+        BcVec var_map;
+
+        BcVec arrs;
+        BcVec arr_map;
+
+        IF_DC(BcVec strs;)
+        IF_DC(BcVec consts;)
+
+        BcNum zero;
+        IF_BC(BcNum one;)
+        IF_BC(BcNum last;)
+} BcProgram;
+
+struct globals {
+        BcParse prs; // first member is most used
+
+        // For error messages. Can be set to current parsed line,
+        // or [TODO] to current executing line (can be before last parsed one)
+        size_t err_line;
+
+        BcVec input_buffer;
+
+        IF_FEATURE_BC_INTERACTIVE(smallint ttyin;)
+        IF_FEATURE_CLEAN_UP(smallint exiting;)
+
+        BcProgram prog;
+
+        BcVec files;
+
+        char *env_args;
+
+#if ENABLE_FEATURE_EDITING
+        line_input_t *line_input_state;
+#endif
+} FIX_ALIASING;
+#define G (*ptr_to_globals)
+#define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+#define FREE_G() do { \
+        FREE_PTR_TO_GLOBALS(); \
+} while (0)
+#define G_posix (ENABLE_BC && (option_mask32 & BC_FLAG_S))
+#define G_warn  (ENABLE_BC && (option_mask32 & BC_FLAG_W))
+#define G_exreg (ENABLE_DC && (option_mask32 & DC_FLAG_X))
+#if ENABLE_FEATURE_BC_INTERACTIVE
+# define G_interrupt bb_got_signal
+# define G_ttyin     G.ttyin
+#else
+# define G_interrupt 0
+# define G_ttyin     0
+#endif
+#if ENABLE_FEATURE_CLEAN_UP
+# define G_exiting G.exiting
+#else
+# define G_exiting 0
+#endif
+#define IS_BC (ENABLE_BC && (!ENABLE_DC || applet_name[0] == 'b'))
+#define IS_DC (ENABLE_DC && (!ENABLE_BC || applet_name[0] != 'b'))
+
+#if ENABLE_BC
+# define BC_PARSE_REL           (1 << 0)
+# define BC_PARSE_PRINT         (1 << 1)
+# define BC_PARSE_ARRAY         (1 << 2)
+# define BC_PARSE_NOCALL        (1 << 3)
+#endif
+
+#define BC_PROG_MAIN      0
+#define BC_PROG_READ      1
+#if ENABLE_DC
+#define BC_PROG_REQ_FUNCS 2
+#endif
+
+#define BC_FLAG_W (1 << 0)
+#define BC_FLAG_V (1 << 1)
+#define BC_FLAG_S (1 << 2)
+#define BC_FLAG_Q (1 << 3)
+#define BC_FLAG_L (1 << 4)
+#define BC_FLAG_I ((1 << 5) * ENABLE_DC)
+#define DC_FLAG_X ((1 << 6) * ENABLE_DC)
+
+#define BC_MAX_OBASE    ((unsigned) 999)
+#define BC_MAX_DIM      ((unsigned) INT_MAX)
+#define BC_MAX_SCALE    ((unsigned) UINT_MAX)
+#define BC_MAX_STRING   ((unsigned) UINT_MAX - 1)
+#define BC_MAX_NUM      BC_MAX_STRING
+// Unused apart from "limits" message. Just show a "biggish number" there.
+//#define BC_MAX_EXP      ((unsigned long) LONG_MAX)
+//#define BC_MAX_VARS     ((unsigned long) SIZE_MAX - 1)
+#define BC_MAX_EXP_STR  "999999999"
+#define BC_MAX_VARS_STR "999999999"
+
+#define BC_MAX_OBASE_STR "999"
+
+#if INT_MAX == 2147483647
+# define BC_MAX_DIM_STR "2147483647"
+#elif INT_MAX == 9223372036854775807
+# define BC_MAX_DIM_STR "9223372036854775807"
+#else
+# error Strange INT_MAX
+#endif
+
+#if UINT_MAX == 4294967295
+# define BC_MAX_SCALE_STR  "4294967295"
+# define BC_MAX_STRING_STR "4294967294"
+#elif UINT_MAX == 18446744073709551615
+# define BC_MAX_SCALE_STR  "18446744073709551615"
+# define BC_MAX_STRING_STR "18446744073709551614"
+#else
+# error Strange UINT_MAX
+#endif
+#define BC_MAX_NUM_STR BC_MAX_STRING_STR
+
+// In configurations where errors abort instead of propagating error
+// return code up the call chain, functions returning BC_STATUS
+// actually don't return anything, they always succeed and return "void".
+// A macro wrapper is provided, which makes this statement work:
+//  s = zbc_func(...)
+// and makes it visible to the compiler that s is always zero,
+// allowing compiler to optimize dead code after the statement.
+//
+// To make code more readable, each such function has a "z"
+// ("always returning zero") prefix, i.e. zbc_foo or zdc_foo.
+//
+#if ENABLE_FEATURE_BC_INTERACTIVE || ENABLE_FEATURE_CLEAN_UP
+# define ERRORS_ARE_FATAL 0
+# define ERRORFUNC        /*nothing*/
+# define IF_ERROR_RETURN_POSSIBLE(a)  a
+# define BC_STATUS        BcStatus
+# define RETURN_STATUS(v) return (v)
+# define COMMA_SUCCESS    /*nothing*/
+#else
+# define ERRORS_ARE_FATAL 1
+# define ERRORFUNC        NORETURN
+# define IF_ERROR_RETURN_POSSIBLE(a)  /*nothing*/
+# define BC_STATUS        void
+# define RETURN_STATUS(v) do { ((void)(v)); return; } while (0)
+# define COMMA_SUCCESS    ,BC_STATUS_SUCCESS
+#endif
+
+//
+// Utility routines
+//
+
+#define BC_MAX(a, b) ((a) > (b) ? (a) : (b))
+#define BC_MIN(a, b) ((a) < (b) ? (a) : (b))
+
+static void fflush_and_check(void)
+{
+        fflush_all();
+        if (ferror(stdout) || ferror(stderr))
+                bb_perror_msg_and_die("output error");
+}
+
+#if ENABLE_FEATURE_CLEAN_UP
+#define QUIT_OR_RETURN_TO_MAIN \
+do { \
+        IF_FEATURE_BC_INTERACTIVE(G_ttyin = 0;) /* do not loop in main loop anymore */ \
+        G_exiting = 1; \
+        return BC_STATUS_FAILURE; \
+} while (0)
+#else
+static void quit(void) NORETURN;
+static void quit(void)
+{
+        if (ferror(stdin))
+                bb_perror_msg_and_die("input error");
+        fflush_and_check();
+        dbg_exec("quit(): exiting with exitcode SUCCESS");
+        exit(0);
+}
+#define QUIT_OR_RETURN_TO_MAIN quit()
+#endif
+
+static void bc_verror_msg(const char *fmt, va_list p)
+{
+        const char *sv = sv; // for compiler
+        if (G.prs.lex_filename) {
+                sv = applet_name;
+                applet_name = xasprintf("%s: %s:%lu", applet_name,
+                        G.prs.lex_filename, (unsigned long)G.err_line
+                );
+        }
+        bb_verror_msg(fmt, p, NULL);
+        if (G.prs.lex_filename) {
+                free((char*)applet_name);
+                applet_name = sv;
+        }
+}
+
+static NOINLINE ERRORFUNC int bc_error_fmt(const char *fmt, ...)
+{
+        va_list p;
+
+        va_start(p, fmt);
+        bc_verror_msg(fmt, p);
+        va_end(p);
+
+        if (ENABLE_FEATURE_CLEAN_UP || G_ttyin)
+                IF_ERROR_RETURN_POSSIBLE(return BC_STATUS_FAILURE);
+        exit(1);
+}
+
+#if ENABLE_BC
+static NOINLINE BC_STATUS zbc_posix_error_fmt(const char *fmt, ...)
+{
+        va_list p;
+
+        // Are non-POSIX constructs totally ok?
+        if (!(option_mask32 & (BC_FLAG_S|BC_FLAG_W)))
+                RETURN_STATUS(BC_STATUS_SUCCESS); // yes
+
+        va_start(p, fmt);
+        bc_verror_msg(fmt, p);
+        va_end(p);
+
+        // Do we treat non-POSIX constructs as errors?
+        if (!(option_mask32 & BC_FLAG_S))
+                RETURN_STATUS(BC_STATUS_SUCCESS); // no, it's a warning
+
+        if (ENABLE_FEATURE_CLEAN_UP || G_ttyin)
+                RETURN_STATUS(BC_STATUS_FAILURE);
+        exit(1);
+}
+#define zbc_posix_error_fmt(...) (zbc_posix_error_fmt(__VA_ARGS__) COMMA_SUCCESS)
+#endif
+
+// We use error functions with "return bc_error(FMT[, PARAMS])" idiom.
+// This idiom begs for tail-call optimization, but for it to work,
+// function must not have caller-cleaned parameters on stack.
+// Unfortunately, vararg function API does exactly that on most arches.
+// Thus, use these shims for the cases when we have no vararg PARAMS:
+static ERRORFUNC int bc_error(const char *msg)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_fmt("%s", msg);
+}
+static ERRORFUNC int bc_error_at(const char *msg)
+{
+        const char *err_at = G.prs.lex_next_at;
+        if (err_at) {
+                IF_ERROR_RETURN_POSSIBLE(return) bc_error_fmt(
+                        "%s at '%.*s'",
+                        msg,
+                        (int)(strchrnul(err_at, '\n') - err_at),
+                        err_at
+                );
+        }
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_fmt("%s", msg);
+}
+static ERRORFUNC int bc_error_bad_character(char c)
+{
+        if (!c)
+                IF_ERROR_RETURN_POSSIBLE(return) bc_error("NUL character");
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_fmt("bad character '%c'", c);
+}
+static ERRORFUNC int bc_error_bad_function_definition(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_at("bad function definition");
+}
+static ERRORFUNC int bc_error_bad_expression(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_at("bad expression");
+}
+static ERRORFUNC int bc_error_bad_assignment(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_at(
+                "bad assignment: left side must be variable or array element"
+        );
+}
+static ERRORFUNC int bc_error_bad_token(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error_at("bad token");
+}
+static ERRORFUNC int bc_error_stack_has_too_few_elements(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error("stack has too few elements");
+}
+static ERRORFUNC int bc_error_variable_is_wrong_type(void)
+{
+        IF_ERROR_RETURN_POSSIBLE(return) bc_error("variable is wrong type");
+}
+#if ENABLE_BC
+static BC_STATUS zbc_POSIX_requires(const char *msg)
+{
+        RETURN_STATUS(zbc_posix_error_fmt("POSIX requires %s", msg));
+}
+#define zbc_POSIX_requires(...) (zbc_POSIX_requires(__VA_ARGS__) COMMA_SUCCESS)
+static BC_STATUS zbc_POSIX_does_not_allow(const char *msg)
+{
+        RETURN_STATUS(zbc_posix_error_fmt("%s%s", "POSIX does not allow ", msg));
+}
+#define zbc_POSIX_does_not_allow(...) (zbc_POSIX_does_not_allow(__VA_ARGS__) COMMA_SUCCESS)
+static BC_STATUS zbc_POSIX_does_not_allow_bool_ops_this_is_bad(const char *msg)
+{
+        RETURN_STATUS(zbc_posix_error_fmt("%s%s %s", "POSIX does not allow ", "boolean operators; this is bad:", msg));
+}
+#define zbc_POSIX_does_not_allow_bool_ops_this_is_bad(...) (zbc_POSIX_does_not_allow_bool_ops_this_is_bad(__VA_ARGS__) COMMA_SUCCESS)
+static BC_STATUS zbc_POSIX_does_not_allow_empty_X_expression_in_for(const char *msg)
+{
+        RETURN_STATUS(zbc_posix_error_fmt("%san empty %s expression in 'for()'", "POSIX does not allow ", msg));
+}
+#define zbc_POSIX_does_not_allow_empty_X_expression_in_for(...) (zbc_POSIX_does_not_allow_empty_X_expression_in_for(__VA_ARGS__) COMMA_SUCCESS)
+#endif
+
+static void bc_vec_grow(BcVec *v, size_t n)
+{
+        size_t cap = v->cap * 2;
+        while (cap < v->len + n) cap *= 2;
+        v->v = xrealloc(v->v, v->size * cap);
+        v->cap = cap;
+}
+
+static void bc_vec_init(BcVec *v, size_t esize, BcVecFree dtor)
+{
+        v->size = esize;
+        v->cap = BC_VEC_START_CAP;
+        v->len = 0;
+        v->dtor = dtor;
+        v->v = xmalloc(esize * BC_VEC_START_CAP);
+}
+
+static void bc_char_vec_init(BcVec *v)
+{
+        bc_vec_init(v, sizeof(char), NULL);
+}
+
+static void bc_vec_expand(BcVec *v, size_t req)
+{
+        if (v->cap < req) {
+                v->v = xrealloc(v->v, v->size * req);
+                v->cap = req;
+        }
+}
+
+static void bc_vec_pop(BcVec *v)
+{
+        v->len--;
+        if (v->dtor)
+                v->dtor(v->v + (v->size * v->len));
+}
+
+static void bc_vec_npop(BcVec *v, size_t n)
+{
+        if (!v->dtor)
+                v->len -= n;
+        else {
+                size_t len = v->len - n;
+                while (v->len > len) v->dtor(v->v + (v->size * --v->len));
+        }
+}
+
+static void bc_vec_pop_all(BcVec *v)
+{
+        bc_vec_npop(v, v->len);
+}
+
+static size_t bc_vec_push(BcVec *v, const void *data)
+{
+        size_t len = v->len;
+        if (len >= v->cap) bc_vec_grow(v, 1);
+        memmove(v->v + (v->size * len), data, v->size);
+        v->len++;
+        return len;
+}
+
+// G.prog.results often needs "pop old operand, push result" idiom.
+// Can do this without a few extra ops
+static size_t bc_result_pop_and_push(const void *data)
+{
+        BcVec *v = &G.prog.results;
+        char *last;
+        size_t len = v->len - 1;
+
+        last = v->v + (v->size * len);
+        if (v->dtor)
+                v->dtor(last);
+        memmove(last, data, v->size);
+        return len;
+}
+
+static size_t bc_vec_pushByte(BcVec *v, char data)
+{
+        return bc_vec_push(v, &data);
+}
+
+static size_t bc_vec_pushZeroByte(BcVec *v)
+{
+        //return bc_vec_pushByte(v, '\0');
+        // better:
+        return bc_vec_push(v, &const_int_0);
+}
+
+static void bc_vec_pushAt(BcVec *v, const void *data, size_t idx)
+{
+        if (idx == v->len)
+                bc_vec_push(v, data);
+        else {
+                char *ptr;
+
+                if (v->len == v->cap) bc_vec_grow(v, 1);
+
+                ptr = v->v + v->size * idx;
+
+                memmove(ptr + v->size, ptr, v->size * (v->len++ - idx));
+                memmove(ptr, data, v->size);
+        }
+}
+
+static void bc_vec_string(BcVec *v, size_t len, const char *str)
+{
+        bc_vec_pop_all(v);
+        bc_vec_expand(v, len + 1);
+        memcpy(v->v, str, len);
+        v->len = len;
+
+        bc_vec_pushZeroByte(v);
+}
+
+static void *bc_vec_item(const BcVec *v, size_t idx)
+{
+        return v->v + v->size * idx;
+}
+
+static void *bc_vec_item_rev(const BcVec *v, size_t idx)
+{
+        return v->v + v->size * (v->len - idx - 1);
+}
+
+static void *bc_vec_top(const BcVec *v)
+{
+        return v->v + v->size * (v->len - 1);
+}
+
+static FAST_FUNC void bc_vec_free(void *vec)
+{
+        BcVec *v = (BcVec *) vec;
+        bc_vec_pop_all(v);
+        free(v->v);
+}
+
+static BcFunc* xc_program_func(size_t idx)
+{
+        return bc_vec_item(&G.prog.fns, idx);
+}
+// BC_PROG_MAIN is zeroth element, so:
+#define xc_program_func_BC_PROG_MAIN() ((BcFunc*)(G.prog.fns.v))
+
+#if ENABLE_BC
+static BcFunc* bc_program_current_func(void)
+{
+        BcInstPtr *ip = bc_vec_top(&G.prog.exestack);
+        BcFunc *func = xc_program_func(ip->func);
+        return func;
+}
+#endif
+
+static char** xc_program_str(size_t idx)
+{
+#if ENABLE_BC
+        if (IS_BC) {
+                BcFunc *func = bc_program_current_func();
+                return bc_vec_item(&func->strs, idx);
+        }
+#endif
+        IF_DC(return bc_vec_item(&G.prog.strs, idx);)
+}
+
+static char** xc_program_const(size_t idx)
+{
+#if ENABLE_BC
+        if (IS_BC) {
+                BcFunc *func = bc_program_current_func();
+                return bc_vec_item(&func->consts, idx);
+        }
+#endif
+        IF_DC(return bc_vec_item(&G.prog.consts, idx);)
+}
+
+static int bc_id_cmp(const void *e1, const void *e2)
+{
+        return strcmp(((const BcId *) e1)->name, ((const BcId *) e2)->name);
+}
+
+static FAST_FUNC void bc_id_free(void *id)
+{
+        free(((BcId *) id)->name);
+}
+
+static size_t bc_map_find_ge(const BcVec *v, const void *ptr)
+{
+        size_t low = 0, high = v->len;
+
+        while (low < high) {
+                size_t mid = (low + high) / 2;
+                BcId *id = bc_vec_item(v, mid);
+                int result = bc_id_cmp(ptr, id);
+
+                if (result == 0)
+                        return mid;
+                if (result < 0)
+                        high = mid;
+                else
+                        low = mid + 1;
+        }
+
+        return low;
+}
+
+static int bc_map_insert(BcVec *v, const void *ptr, size_t *i)
+{
+        size_t n = *i = bc_map_find_ge(v, ptr);
+
+        if (n == v->len)
+                bc_vec_push(v, ptr);
+        else if (!bc_id_cmp(ptr, bc_vec_item(v, n)))
+                return 0; // "was not inserted"
+        else
+                bc_vec_pushAt(v, ptr, n);
+        return 1; // "was inserted"
+}
+
+#if ENABLE_BC
+static size_t bc_map_find_exact(const BcVec *v, const void *ptr)
+{
+        size_t i = bc_map_find_ge(v, ptr);
+        if (i >= v->len) return BC_VEC_INVALID_IDX;
+        return bc_id_cmp(ptr, bc_vec_item(v, i)) ? BC_VEC_INVALID_IDX : i;
+}
+#endif
+
+static void bc_num_setToZero(BcNum *n, size_t scale)
+{
+        n->len = 0;
+        n->neg = false;
+        n->rdx = scale;
+}
+
+static void bc_num_zero(BcNum *n)
+{
+        bc_num_setToZero(n, 0);
+}
+
+static void bc_num_one(BcNum *n)
+{
+        bc_num_setToZero(n, 0);
+        n->len = 1;
+        n->num[0] = 1;
+}
+
+// Note: this also sets BcNum to zero
+static void bc_num_init(BcNum *n, size_t req)
+{
+        req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE;
+        //memset(n, 0, sizeof(BcNum)); - cleared by assignments below
+        n->num = xmalloc(req);
+        n->cap = req;
+        n->rdx = 0;
+        n->len = 0;
+        n->neg = false;
+}
+
+static void bc_num_init_DEF_SIZE(BcNum *n)
+{
+        bc_num_init(n, BC_NUM_DEF_SIZE);
+}
+
+static void bc_num_expand(BcNum *n, size_t req)
+{
+        req = req >= BC_NUM_DEF_SIZE ? req : BC_NUM_DEF_SIZE;
+        if (req > n->cap) {
+                n->num = xrealloc(n->num, req);
+                n->cap = req;
+        }
+}
+
+static FAST_FUNC void bc_num_free(void *num)
+{
+        free(((BcNum *) num)->num);
+}
+
+static void bc_num_copy(BcNum *d, BcNum *s)
+{
+        if (d != s) {
+                bc_num_expand(d, s->cap);
+                d->len = s->len;
+                d->neg = s->neg;
+                d->rdx = s->rdx;
+                memcpy(d->num, s->num, sizeof(BcDig) * d->len);
+        }
+}
+
+static BC_STATUS zbc_num_ulong_abs(BcNum *n, unsigned long *result_p)
+{
+        size_t i;
+        unsigned long result;
+
+        result = 0;
+        i = n->len;
+        while (i > n->rdx) {
+                unsigned long prev = result;
+                result = result * 10 + n->num[--i];
+                // Even overflowed N*10 can still satisfy N*10>=N. For example,
+                //    0x1ff00000 * 10 is 0x13f600000,
+                // or 0x3f600000 truncated to 32 bits. Which is larger.
+                // However, (N*10)/8 < N check is always correct.
+                if ((result / 8) < prev)
+                        RETURN_STATUS(bc_error("overflow"));
+        }
+        *result_p = result;
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_num_ulong_abs(...) (zbc_num_ulong_abs(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_num_ulong(BcNum *n, unsigned long *result_p)
+{
+        if (n->neg) RETURN_STATUS(bc_error("negative number"));
+
+        RETURN_STATUS(zbc_num_ulong_abs(n, result_p));
+}
+#define zbc_num_ulong(...) (zbc_num_ulong(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ULONG_MAX == 0xffffffffUL // 10 digits: 4294967295
+# define ULONG_NUM_BUFSIZE (10 > BC_NUM_DEF_SIZE ? 10 : BC_NUM_DEF_SIZE)
+#elif ULONG_MAX == 0xffffffffffffffffULL // 20 digits: 18446744073709551615
+# define ULONG_NUM_BUFSIZE (20 > BC_NUM_DEF_SIZE ? 20 : BC_NUM_DEF_SIZE)
+#endif
+// minimum BC_NUM_DEF_SIZE, so that bc_num_expand() in bc_num_ulong2num()
+// would not hit realloc() code path - not good if num[] is not malloced
+
+static void bc_num_ulong2num(BcNum *n, unsigned long val)
+{
+        BcDig *ptr;
+
+        bc_num_zero(n);
+
+        if (val == 0) return;
+
+        bc_num_expand(n, ULONG_NUM_BUFSIZE);
+
+        ptr = n->num;
+        for (;;) {
+                n->len++;
+                *ptr++ = val % 10;
+                val /= 10;
+                if (val == 0) break;
+        }
+}
+
+static void bc_num_subArrays(BcDig *restrict a, BcDig *restrict b, size_t len)
+{
+        size_t i, j;
+        for (i = 0; i < len; ++i) {
+                a[i] -= b[i];
+                for (j = i; a[j] < 0;) {
+                        a[j++] += 10;
+                        a[j] -= 1;
+                }
+        }
+}
+
+static ssize_t bc_num_compare(BcDig *restrict a, BcDig *restrict b, size_t len)
+{
+        size_t i = len;
+        for (;;) {
+                int c;
+                if (i == 0)
+                        return 0;
+                i--;
+                c = a[i] - b[i];
+                if (c != 0) {
+                        i++;
+                        if (c < 0)
+                                return -i;
+                        return i;
+                }
+        }
+}
+
+#define BC_NUM_NEG(n, neg)      ((((ssize_t)(n)) ^ -((ssize_t)(neg))) + (neg))
+#define BC_NUM_ONE(n)           ((n)->len == 1 && (n)->rdx == 0 && (n)->num[0] == 1)
+#define BC_NUM_INT(n)           ((n)->len - (n)->rdx)
+//#define BC_NUM_AREQ(a, b)       (BC_MAX((a)->rdx, (b)->rdx) + BC_MAX(BC_NUM_INT(a), BC_NUM_INT(b)) + 1)
+static /*ALWAYS_INLINE*/ size_t BC_NUM_AREQ(BcNum *a, BcNum *b)
+{
+        return BC_MAX(a->rdx, b->rdx) + BC_MAX(BC_NUM_INT(a), BC_NUM_INT(b)) + 1;
+}
+//#define BC_NUM_MREQ(a, b, scale) (BC_NUM_INT(a) + BC_NUM_INT(b) + BC_MAX((scale), (a)->rdx + (b)->rdx) + 1)
+static /*ALWAYS_INLINE*/ size_t BC_NUM_MREQ(BcNum *a, BcNum *b, size_t scale)
+{
+        return BC_NUM_INT(a) + BC_NUM_INT(b) + BC_MAX(scale, a->rdx + b->rdx) + 1;
+}
+
+static ssize_t bc_num_cmp(BcNum *a, BcNum *b)
+{
+        size_t i, min, a_int, b_int, diff;
+        BcDig *max_num, *min_num;
+        bool a_max, neg;
+        ssize_t cmp;
+
+        if (a == b) return 0;
+        if (a->len == 0) return BC_NUM_NEG(!!b->len, !b->neg);
+        if (b->len == 0) return BC_NUM_NEG(1, a->neg);
+
+        if (a->neg != b->neg) // signs of a and b differ
+                // +a,-b = a>b = 1 or -a,+b = a<b = -1
+                return (int)b->neg - (int)a->neg;
+        neg = a->neg; // 1 if both negative, 0 if both positive
+
+        a_int = BC_NUM_INT(a);
+        b_int = BC_NUM_INT(b);
+        a_int -= b_int;
+
+        if (a_int != 0) return (ssize_t) a_int;
+
+        a_max = (a->rdx > b->rdx);
+        if (a_max) {
+                min = b->rdx;
+                diff = a->rdx - b->rdx;
+                max_num = a->num + diff;
+                min_num = b->num;
+                // neg = (a_max == neg); - NOP (maps 1->1 and 0->0)
+        } else {
+                min = a->rdx;
+                diff = b->rdx - a->rdx;
+                max_num = b->num + diff;
+                min_num = a->num;
+                neg = !neg; // same as "neg = (a_max == neg)"
+        }
+
+        cmp = bc_num_compare(max_num, min_num, b_int + min);
+        if (cmp != 0) return BC_NUM_NEG(cmp, neg);
+
+        for (max_num -= diff, i = diff - 1; i < diff; --i) {
+                if (max_num[i]) return BC_NUM_NEG(1, neg);
+        }
+
+        return 0;
+}
+
+static void bc_num_truncate(BcNum *n, size_t places)
+{
+        if (places == 0) return;
+
+        n->rdx -= places;
+
+        if (n->len != 0) {
+                n->len -= places;
+                memmove(n->num, n->num + places, n->len * sizeof(BcDig));
+        }
+}
+
+static void bc_num_extend(BcNum *n, size_t places)
+{
+        size_t len = n->len + places;
+
+        if (places != 0) {
+                if (n->cap < len) bc_num_expand(n, len);
+
+                memmove(n->num + places, n->num, sizeof(BcDig) * n->len);
+                memset(n->num, 0, sizeof(BcDig) * places);
+
+                n->len += places;
+                n->rdx += places;
+        }
+}
+
+static void bc_num_clean(BcNum *n)
+{
+        while (n->len > 0 && n->num[n->len - 1] == 0) --n->len;
+        if (n->len == 0)
+                n->neg = false;
+        else if (n->len < n->rdx)
+                n->len = n->rdx;
+}
+
+static void bc_num_retireMul(BcNum *n, size_t scale, bool neg1, bool neg2)
+{
+        if (n->rdx < scale)
+                bc_num_extend(n, scale - n->rdx);
+        else
+                bc_num_truncate(n, n->rdx - scale);
+
+        bc_num_clean(n);
+        if (n->len != 0) n->neg = !neg1 != !neg2;
+}
+
+static void bc_num_split(BcNum *restrict n, size_t idx, BcNum *restrict a,
+                         BcNum *restrict b)
+{
+        if (idx < n->len) {
+                b->len = n->len - idx;
+                a->len = idx;
+                a->rdx = b->rdx = 0;
+
+                memcpy(b->num, n->num + idx, b->len * sizeof(BcDig));
+                memcpy(a->num, n->num, idx * sizeof(BcDig));
+        } else {
+                bc_num_zero(b);
+                bc_num_copy(a, n);
+        }
+
+        bc_num_clean(a);
+        bc_num_clean(b);
+}
+
+static BC_STATUS zbc_num_shift(BcNum *n, size_t places)
+{
+        if (places == 0 || n->len == 0) RETURN_STATUS(BC_STATUS_SUCCESS);
+
+        // This check makes sense only if size_t is (much) larger than BC_MAX_NUM.
+        if (SIZE_MAX > (BC_MAX_NUM | 0xff)) {
+                if (places + n->len > BC_MAX_NUM)
+                        RETURN_STATUS(bc_error("number too long: must be [1,"BC_MAX_NUM_STR"]"));
+        }
+
+        if (n->rdx >= places)
+                n->rdx -= places;
+        else {
+                bc_num_extend(n, places - n->rdx);
+                n->rdx = 0;
+        }
+
+        bc_num_clean(n);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_num_shift(...) (zbc_num_shift(__VA_ARGS__) COMMA_SUCCESS)
+
+typedef BC_STATUS (*BcNumBinaryOp)(BcNum *, BcNum *, BcNum *, size_t) FAST_FUNC;
+
+static BC_STATUS zbc_num_binary(BcNum *a, BcNum *b, BcNum *c, size_t scale,
+                              BcNumBinaryOp op, size_t req)
+{
+        BcStatus s;
+        BcNum num2, *ptr_a, *ptr_b;
+        bool init = false;
+
+        if (c == a) {
+                ptr_a = &num2;
+                memcpy(ptr_a, c, sizeof(BcNum));
+                init = true;
+        } else
+                ptr_a = a;
+
+        if (c == b) {
+                ptr_b = &num2;
+                if (c != a) {
+                        memcpy(ptr_b, c, sizeof(BcNum));
+                        init = true;
+                }
+        } else
+                ptr_b = b;
+
+        if (init)
+                bc_num_init(c, req);
+        else
+                bc_num_expand(c, req);
+
+        s = BC_STATUS_SUCCESS;
+        IF_ERROR_RETURN_POSSIBLE(s =) op(ptr_a, ptr_b, c, scale);
+
+        if (init) bc_num_free(&num2);
+
+        RETURN_STATUS(s);
+}
+#define zbc_num_binary(...) (zbc_num_binary(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_a(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+static FAST_FUNC BC_STATUS zbc_num_s(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+static FAST_FUNC BC_STATUS zbc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+static FAST_FUNC BC_STATUS zbc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+static FAST_FUNC BC_STATUS zbc_num_rem(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale);
+
+static FAST_FUNC BC_STATUS zbc_num_add(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        BcNumBinaryOp op = (!a->neg == !b->neg) ? zbc_num_a : zbc_num_s;
+        (void) scale;
+        RETURN_STATUS(zbc_num_binary(a, b, c, false, op, BC_NUM_AREQ(a, b)));
+}
+
+static FAST_FUNC BC_STATUS zbc_num_sub(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        BcNumBinaryOp op = (!a->neg == !b->neg) ? zbc_num_s : zbc_num_a;
+        (void) scale;
+        RETURN_STATUS(zbc_num_binary(a, b, c, true, op, BC_NUM_AREQ(a, b)));
+}
+
+static FAST_FUNC BC_STATUS zbc_num_mul(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        size_t req = BC_NUM_MREQ(a, b, scale);
+        RETURN_STATUS(zbc_num_binary(a, b, c, scale, zbc_num_m, req));
+}
+
+static FAST_FUNC BC_STATUS zbc_num_div(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        size_t req = BC_NUM_MREQ(a, b, scale);
+        RETURN_STATUS(zbc_num_binary(a, b, c, scale, zbc_num_d, req));
+}
+
+static FAST_FUNC BC_STATUS zbc_num_mod(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        size_t req = BC_NUM_MREQ(a, b, scale);
+        RETURN_STATUS(zbc_num_binary(a, b, c, scale, zbc_num_rem, req));
+}
+
+static FAST_FUNC BC_STATUS zbc_num_pow(BcNum *a, BcNum *b, BcNum *c, size_t scale)
+{
+        RETURN_STATUS(zbc_num_binary(a, b, c, scale, zbc_num_p, a->len * b->len + 1));
+}
+
+static const BcNumBinaryOp zxc_program_ops[] = {
+        zbc_num_pow, zbc_num_mul, zbc_num_div, zbc_num_mod, zbc_num_add, zbc_num_sub,
+};
+#define zbc_num_add(...) (zbc_num_add(__VA_ARGS__) COMMA_SUCCESS)
+#define zbc_num_sub(...) (zbc_num_sub(__VA_ARGS__) COMMA_SUCCESS)
+#define zbc_num_mul(...) (zbc_num_mul(__VA_ARGS__) COMMA_SUCCESS)
+#define zbc_num_div(...) (zbc_num_div(__VA_ARGS__) COMMA_SUCCESS)
+#define zbc_num_mod(...) (zbc_num_mod(__VA_ARGS__) COMMA_SUCCESS)
+#define zbc_num_pow(...) (zbc_num_pow(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_num_inv(BcNum *a, BcNum *b, size_t scale)
+{
+        BcNum one;
+        BcDig num[2];
+
+        one.cap = 2;
+        one.num = num;
+        bc_num_one(&one);
+
+        RETURN_STATUS(zbc_num_div(&one, a, b, scale));
+}
+#define zbc_num_inv(...) (zbc_num_inv(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_a(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub)
+{
+        BcDig *ptr, *ptr_a, *ptr_b, *ptr_c;
+        size_t i, max, min_rdx, min_int, diff, a_int, b_int;
+        unsigned carry;
+
+        // Because this function doesn't need to use scale (per the bc spec),
+        // I am hijacking it to say whether it's doing an add or a subtract.
+
+        if (a->len == 0) {
+                bc_num_copy(c, b);
+                if (sub && c->len) c->neg = !c->neg;
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (b->len == 0) {
+                bc_num_copy(c, a);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        c->neg = a->neg;
+        c->rdx = BC_MAX(a->rdx, b->rdx);
+        min_rdx = BC_MIN(a->rdx, b->rdx);
+        c->len = 0;
+
+        if (a->rdx > b->rdx) {
+                diff = a->rdx - b->rdx;
+                ptr = a->num;
+                ptr_a = a->num + diff;
+                ptr_b = b->num;
+        } else {
+                diff = b->rdx - a->rdx;
+                ptr = b->num;
+                ptr_a = a->num;
+                ptr_b = b->num + diff;
+        }
+
+        ptr_c = c->num;
+        for (i = 0; i < diff; ++i, ++c->len)
+                ptr_c[i] = ptr[i];
+
+        ptr_c += diff;
+        a_int = BC_NUM_INT(a);
+        b_int = BC_NUM_INT(b);
+
+        if (a_int > b_int) {
+                min_int = b_int;
+                max = a_int;
+                ptr = ptr_a;
+        } else {
+                min_int = a_int;
+                max = b_int;
+                ptr = ptr_b;
+        }
+
+        carry = 0;
+        for (i = 0; i < min_rdx + min_int; ++i) {
+                unsigned in = (unsigned)ptr_a[i] + (unsigned)ptr_b[i] + carry;
+                carry = in / 10;
+                ptr_c[i] = (BcDig)(in % 10);
+        }
+        for (; i < max + min_rdx; ++i) {
+                unsigned in = (unsigned)ptr[i] + carry;
+                carry = in / 10;
+                ptr_c[i] = (BcDig)(in % 10);
+        }
+        c->len += i;
+
+        if (carry != 0) c->num[c->len++] = (BcDig) carry;
+
+        RETURN_STATUS(BC_STATUS_SUCCESS); // can't make void, see zbc_num_binary()
+}
+
+static FAST_FUNC BC_STATUS zbc_num_s(BcNum *a, BcNum *b, BcNum *restrict c, size_t sub)
+{
+        ssize_t cmp;
+        BcNum *minuend, *subtrahend;
+        size_t start;
+        bool aneg, bneg, neg;
+
+        // Because this function doesn't need to use scale (per the bc spec),
+        // I am hijacking it to say whether it's doing an add or a subtract.
+
+        if (a->len == 0) {
+                bc_num_copy(c, b);
+                if (sub && c->len) c->neg = !c->neg;
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (b->len == 0) {
+                bc_num_copy(c, a);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        aneg = a->neg;
+        bneg = b->neg;
+        a->neg = b->neg = false;
+
+        cmp = bc_num_cmp(a, b);
+
+        a->neg = aneg;
+        b->neg = bneg;
+
+        if (cmp == 0) {
+                bc_num_setToZero(c, BC_MAX(a->rdx, b->rdx));
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (cmp > 0) {
+                neg = a->neg;
+                minuend = a;
+                subtrahend = b;
+        } else {
+                neg = b->neg;
+                if (sub) neg = !neg;
+                minuend = b;
+                subtrahend = a;
+        }
+
+        bc_num_copy(c, minuend);
+        c->neg = neg;
+
+        if (c->rdx < subtrahend->rdx) {
+                bc_num_extend(c, subtrahend->rdx - c->rdx);
+                start = 0;
+        } else
+                start = c->rdx - subtrahend->rdx;
+
+        bc_num_subArrays(c->num + start, subtrahend->num, subtrahend->len);
+
+        bc_num_clean(c);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS); // can't make void, see zbc_num_binary()
+}
+
+static FAST_FUNC BC_STATUS zbc_num_k(BcNum *restrict a, BcNum *restrict b,
+                         BcNum *restrict c)
+#define zbc_num_k(...) (zbc_num_k(__VA_ARGS__) COMMA_SUCCESS)
+{
+        BcStatus s;
+        size_t max = BC_MAX(a->len, b->len), max2 = (max + 1) / 2;
+        BcNum l1, h1, l2, h2, m2, m1, z0, z1, z2, temp;
+        bool aone;
+
+        if (a->len == 0 || b->len == 0) {
+                bc_num_zero(c);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        aone = BC_NUM_ONE(a);
+        if (aone || BC_NUM_ONE(b)) {
+                bc_num_copy(c, aone ? b : a);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        if (a->len + b->len < BC_NUM_KARATSUBA_LEN
+         || a->len < BC_NUM_KARATSUBA_LEN
+         || b->len < BC_NUM_KARATSUBA_LEN
+        ) {
+                size_t i, j, len;
+
+                bc_num_expand(c, a->len + b->len + 1);
+
+                memset(c->num, 0, sizeof(BcDig) * c->cap);
+                c->len = len = 0;
+
+                for (i = 0; i < b->len; ++i) {
+                        unsigned carry = 0;
+                        for (j = 0; j < a->len; ++j) {
+                                unsigned in = c->num[i + j];
+                                in += (unsigned)a->num[j] * (unsigned)b->num[i] + carry;
+                                // note: compilers prefer _unsigned_ div/const
+                                carry = in / 10;
+                                c->num[i + j] = (BcDig)(in % 10);
+                        }
+
+                        c->num[i + j] += (BcDig) carry;
+                        len = BC_MAX(len, i + j + !!carry);
+
+#if ENABLE_FEATURE_BC_INTERACTIVE
+                        // a=2^1000000
+                        // a*a <- without check below, this will not be interruptible
+                        if (G_interrupt) return BC_STATUS_FAILURE;
+#endif
+                }
+
+                c->len = len;
+
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        bc_num_init(&l1, max);
+        bc_num_init(&h1, max);
+        bc_num_init(&l2, max);
+        bc_num_init(&h2, max);
+        bc_num_init(&m1, max);
+        bc_num_init(&m2, max);
+        bc_num_init(&z0, max);
+        bc_num_init(&z1, max);
+        bc_num_init(&z2, max);
+        bc_num_init(&temp, max + max);
+
+        bc_num_split(a, max2, &l1, &h1);
+        bc_num_split(b, max2, &l2, &h2);
+
+        s = zbc_num_add(&h1, &l1, &m1, 0);
+        if (s) goto err;
+        s = zbc_num_add(&h2, &l2, &m2, 0);
+        if (s) goto err;
+
+        s = zbc_num_k(&h1, &h2, &z0);
+        if (s) goto err;
+        s = zbc_num_k(&m1, &m2, &z1);
+        if (s) goto err;
+        s = zbc_num_k(&l1, &l2, &z2);
+        if (s) goto err;
+
+        s = zbc_num_sub(&z1, &z0, &temp, 0);
+        if (s) goto err;
+        s = zbc_num_sub(&temp, &z2, &z1, 0);
+        if (s) goto err;
+
+        s = zbc_num_shift(&z0, max2 * 2);
+        if (s) goto err;
+        s = zbc_num_shift(&z1, max2);
+        if (s) goto err;
+        s = zbc_num_add(&z0, &z1, &temp, 0);
+        if (s) goto err;
+        s = zbc_num_add(&temp, &z2, c, 0);
+ err:
+        bc_num_free(&temp);
+        bc_num_free(&z2);
+        bc_num_free(&z1);
+        bc_num_free(&z0);
+        bc_num_free(&m2);
+        bc_num_free(&m1);
+        bc_num_free(&h2);
+        bc_num_free(&l2);
+        bc_num_free(&h1);
+        bc_num_free(&l1);
+        RETURN_STATUS(s);
+}
+
+static FAST_FUNC BC_STATUS zbc_num_m(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale)
+{
+        BcStatus s;
+        BcNum cpa, cpb;
+        size_t maxrdx = BC_MAX(a->rdx, b->rdx);
+
+        scale = BC_MAX(scale, a->rdx);
+        scale = BC_MAX(scale, b->rdx);
+        scale = BC_MIN(a->rdx + b->rdx, scale);
+        maxrdx = BC_MAX(maxrdx, scale);
+
+        bc_num_init(&cpa, a->len);
+        bc_num_init(&cpb, b->len);
+
+        bc_num_copy(&cpa, a);
+        bc_num_copy(&cpb, b);
+        cpa.neg = cpb.neg = false;
+
+        s = zbc_num_shift(&cpa, maxrdx);
+        if (s) goto err;
+        s = zbc_num_shift(&cpb, maxrdx);
+        if (s) goto err;
+        s = zbc_num_k(&cpa, &cpb, c);
+        if (s) goto err;
+
+        maxrdx += scale;
+        bc_num_expand(c, c->len + maxrdx);
+
+        if (c->len < maxrdx) {
+                memset(c->num + c->len, 0, (c->cap - c->len) * sizeof(BcDig));
+                c->len += maxrdx;
+        }
+
+        c->rdx = maxrdx;
+        bc_num_retireMul(c, scale, a->neg, b->neg);
+ err:
+        bc_num_free(&cpb);
+        bc_num_free(&cpa);
+        RETURN_STATUS(s);
+}
+#define zbc_num_m(...) (zbc_num_m(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_d(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale)
+{
+        BcStatus s;
+        size_t len, end, i;
+        BcNum cp;
+
+        if (b->len == 0)
+                RETURN_STATUS(bc_error("divide by zero"));
+        if (a->len == 0) {
+                bc_num_setToZero(c, scale);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (BC_NUM_ONE(b)) {
+                bc_num_copy(c, a);
+                bc_num_retireMul(c, scale, a->neg, b->neg);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        bc_num_init(&cp, BC_NUM_MREQ(a, b, scale));
+        bc_num_copy(&cp, a);
+        len = b->len;
+
+        if (len > cp.len) {
+                bc_num_expand(&cp, len + 2);
+                bc_num_extend(&cp, len - cp.len);
+        }
+
+        if (b->rdx > cp.rdx) bc_num_extend(&cp, b->rdx - cp.rdx);
+        cp.rdx -= b->rdx;
+        if (scale > cp.rdx) bc_num_extend(&cp, scale - cp.rdx);
+
+        if (b->rdx == b->len) {
+                for (;;) {
+                        if (len == 0) break;
+                        len--;
+                        if (b->num[len] != 0)
+                                break;
+                }
+                len++;
+        }
+
+        if (cp.cap == cp.len) bc_num_expand(&cp, cp.len + 1);
+
+        // We want an extra zero in front to make things simpler.
+        cp.num[cp.len++] = 0;
+        end = cp.len - len;
+
+        bc_num_expand(c, cp.len);
+
+        bc_num_zero(c);
+        memset(c->num + end, 0, (c->cap - end) * sizeof(BcDig));
+        c->rdx = cp.rdx;
+        c->len = cp.len;
+
+        s = BC_STATUS_SUCCESS;
+        for (i = end - 1; i < end; --i) {
+                BcDig *n, q;
+                n = cp.num + i;
+                for (q = 0; n[len] != 0 || bc_num_compare(n, b->num, len) >= 0; ++q)
+                        bc_num_subArrays(n, b->num, len);
+                c->num[i] = q;
+#if ENABLE_FEATURE_BC_INTERACTIVE
+                // a=2^100000
+                // scale=40000
+                // 1/a <- without check below, this will not be interruptible
+                if (G_interrupt) {
+                        s = BC_STATUS_FAILURE;
+                        break;
+                }
+#endif
+        }
+
+        bc_num_retireMul(c, scale, a->neg, b->neg);
+        bc_num_free(&cp);
+
+        RETURN_STATUS(s);
+}
+#define zbc_num_d(...) (zbc_num_d(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_r(BcNum *a, BcNum *b, BcNum *restrict c,
+                         BcNum *restrict d, size_t scale, size_t ts)
+{
+        BcStatus s;
+        BcNum temp;
+        bool neg;
+
+        if (b->len == 0)
+                RETURN_STATUS(bc_error("divide by zero"));
+
+        if (a->len == 0) {
+                bc_num_setToZero(d, ts);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        bc_num_init(&temp, d->cap);
+        s = zbc_num_d(a, b, c, scale);
+        if (s) goto err;
+
+        if (scale != 0) scale = ts;
+
+        s = zbc_num_m(c, b, &temp, scale);
+        if (s) goto err;
+        s = zbc_num_sub(a, &temp, d, scale);
+        if (s) goto err;
+
+        if (ts > d->rdx && d->len) bc_num_extend(d, ts - d->rdx);
+
+        neg = d->neg;
+        bc_num_retireMul(d, ts, a->neg, b->neg);
+        d->neg = neg;
+ err:
+        bc_num_free(&temp);
+        RETURN_STATUS(s);
+}
+#define zbc_num_r(...) (zbc_num_r(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_rem(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale)
+{
+        BcStatus s;
+        BcNum c1;
+        size_t ts = BC_MAX(scale + b->rdx, a->rdx), len = BC_NUM_MREQ(a, b, ts);
+
+        bc_num_init(&c1, len);
+        s = zbc_num_r(a, b, &c1, c, scale, ts);
+        bc_num_free(&c1);
+
+        RETURN_STATUS(s);
+}
+#define zbc_num_rem(...) (zbc_num_rem(__VA_ARGS__) COMMA_SUCCESS)
+
+static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size_t scale)
+{
+        BcStatus s = BC_STATUS_SUCCESS;
+        BcNum copy;
+        unsigned long pow;
+        size_t i, powrdx, resrdx;
+        bool neg;
+
+        // GNU bc does not allow 2^2.0 - we do
+        for (i = 0; i < b->rdx; i++)
+                if (b->num[i] != 0)
+                        RETURN_STATUS(bc_error("not an integer"));
+
+        if (b->len == 0) {
+                bc_num_one(c);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (a->len == 0) {
+                bc_num_setToZero(c, scale);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (BC_NUM_ONE(b)) {
+                if (!b->neg)
+                        bc_num_copy(c, a);
+                else
+                        s = zbc_num_inv(a, c, scale);
+                RETURN_STATUS(s);
+        }
+
+        neg = b->neg;
+        s = zbc_num_ulong_abs(b, &pow);
+        if (s) RETURN_STATUS(s);
+        // b is not used beyond this point
+
+        bc_num_init(&copy, a->len);
+        bc_num_copy(&copy, a);
+
+        if (!neg) {
+                if (a->rdx > scale)
+                        scale = a->rdx;
+                if (a->rdx * pow < scale)
+                        scale = a->rdx * pow;
+        }
+
+
+        for (powrdx = a->rdx; !(pow & 1); pow >>= 1) {
+                powrdx <<= 1;
+                s = zbc_num_mul(&copy, &copy, &copy, powrdx);
+                if (s) goto err;
+                // Not needed: zbc_num_mul() has a check for ^C:
+                //if (G_interrupt) {
+                //      s = BC_STATUS_FAILURE;
+                //      goto err;
+                //}
+        }
+
+        bc_num_copy(c, &copy);
+
+        for (resrdx = powrdx, pow >>= 1; pow != 0; pow >>= 1) {
+                powrdx <<= 1;
+                s = zbc_num_mul(&copy, &copy, &copy, powrdx);
+                if (s) goto err;
+
+                if (pow & 1) {
+                        resrdx += powrdx;
+                        s = zbc_num_mul(c, &copy, c, resrdx);
+                        if (s) goto err;
+                }
+                // Not needed: zbc_num_mul() has a check for ^C:
+                //if (G_interrupt) {
+                //      s = BC_STATUS_FAILURE;
+                //      goto err;
+                //}
+        }
+
+        if (neg) {
+                s = zbc_num_inv(c, c, scale);
+                if (s) goto err;
+        }
+
+        if (c->rdx > scale) bc_num_truncate(c, c->rdx - scale);
+
+        // We can't use bc_num_clean() here.
+        for (i = 0; i < c->len; ++i)
+                if (c->num[i] != 0)
+                        goto skip;
+        bc_num_setToZero(c, scale);
+ skip:
+
+ err:
+        bc_num_free(&copy);
+        RETURN_STATUS(s);
+}
+#define zbc_num_p(...) (zbc_num_p(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale)
+{
+        BcStatus s;
+        BcNum num1, num2, half, f, fprime, *x0, *x1, *temp;
+        BcDig half_digs[1];
+        size_t pow, len, digs, digs1, resrdx, req, times = 0;
+        ssize_t cmp = 1, cmp1 = SSIZE_MAX, cmp2 = SSIZE_MAX;
+
+        req = BC_MAX(scale, a->rdx) + ((BC_NUM_INT(a) + 1) >> 1) + 1;
+        bc_num_expand(b, req);
+
+        if (a->len == 0) {
+                bc_num_setToZero(b, scale);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+        if (a->neg) {
+                RETURN_STATUS(bc_error("negative number"));
+        }
+        if (BC_NUM_ONE(a)) {
+                bc_num_one(b);
+                bc_num_extend(b, scale);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        scale = BC_MAX(scale, a->rdx) + 1;
+        len = a->len + scale;
+
+        bc_num_init(&num1, len);
+        bc_num_init(&num2, len);
+
+        half.cap = ARRAY_SIZE(half_digs);
+        half.num = half_digs;
+        bc_num_one(&half);
+        half_digs[0] = 5;
+        half.rdx = 1;
+
+        bc_num_init(&f, len);
+        bc_num_init(&fprime, len);
+
+        x0 = &num1;
+        x1 = &num2;
+
+        bc_num_one(x0);
+        pow = BC_NUM_INT(a);
+
+        if (pow) {
+                if (pow & 1)
+                        x0->num[0] = 2;
+                else
+                        x0->num[0] = 6;
+
+                pow -= 2 - (pow & 1);
+
+                bc_num_extend(x0, pow);
+
+                // Make sure to move the radix back.
+                x0->rdx -= pow;
+        }
+
+        x0->rdx = digs = digs1 = 0;
+        resrdx = scale + 2;
+        len = BC_NUM_INT(x0) + resrdx - 1;
+
+        while (cmp != 0 || digs < len) {
+                s = zbc_num_div(a, x0, &f, resrdx);
+                if (s) goto err;
+                s = zbc_num_add(x0, &f, &fprime, resrdx);
+                if (s) goto err;
+                s = zbc_num_mul(&fprime, &half, x1, resrdx);
+                if (s) goto err;
+
+                cmp = bc_num_cmp(x1, x0);
+                digs = x1->len - (unsigned long long) llabs(cmp);
+
+                if (cmp == cmp2 && digs == digs1)
+                        times += 1;
+                else
+                        times = 0;
+
+                resrdx += times > 4;
+
+                cmp2 = cmp1;
+                cmp1 = cmp;
+                digs1 = digs;
+
+                temp = x0;
+                x0 = x1;
+                x1 = temp;
+        }
+
+        bc_num_copy(b, x0);
+        scale -= 1;
+        if (b->rdx > scale) bc_num_truncate(b, b->rdx - scale);
+ err:
+        bc_num_free(&fprime);
+        bc_num_free(&f);
+        bc_num_free(&num2);
+        bc_num_free(&num1);
+        RETURN_STATUS(s);
+}
+#define zbc_num_sqrt(...) (zbc_num_sqrt(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_num_divmod(BcNum *a, BcNum *b, BcNum *c, BcNum *d,
+                              size_t scale)
+{
+        BcStatus s;
+        BcNum num2, *ptr_a;
+        bool init = false;
+        size_t ts = BC_MAX(scale + b->rdx, a->rdx), len = BC_NUM_MREQ(a, b, ts);
+
+        if (c == a) {
+                memcpy(&num2, c, sizeof(BcNum));
+                ptr_a = &num2;
+                bc_num_init(c, len);
+                init = true;
+        } else {
+                ptr_a = a;
+                bc_num_expand(c, len);
+        }
+
+        s = zbc_num_r(ptr_a, b, c, d, scale, ts);
+
+        if (init) bc_num_free(&num2);
+
+        RETURN_STATUS(s);
+}
+#define zbc_num_divmod(...) (zbc_num_divmod(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_DC
+static BC_STATUS zdc_num_modexp(BcNum *a, BcNum *b, BcNum *c, BcNum *restrict d)
+{
+        BcStatus s;
+        BcNum base, exp, two, temp;
+        BcDig two_digs[1];
+
+        if (c->len == 0)
+                RETURN_STATUS(bc_error("divide by zero"));
+        if (a->rdx || b->rdx || c->rdx)
+                RETURN_STATUS(bc_error("not an integer"));
+        if (b->neg)
+                RETURN_STATUS(bc_error("negative number"));
+
+        bc_num_expand(d, c->len);
+        bc_num_init(&base, c->len);
+        bc_num_init(&exp, b->len);
+        bc_num_init(&temp, b->len);
+
+        two.cap = ARRAY_SIZE(two_digs);
+        two.num = two_digs;
+        bc_num_one(&two);
+        two_digs[0] = 2;
+
+        bc_num_one(d);
+
+        s = zbc_num_rem(a, c, &base, 0);
+        if (s) goto err;
+        bc_num_copy(&exp, b);
+
+        while (exp.len != 0) {
+                s = zbc_num_divmod(&exp, &two, &exp, &temp, 0);
+                if (s) goto err;
+
+                if (BC_NUM_ONE(&temp)) {
+                        s = zbc_num_mul(d, &base, &temp, 0);
+                        if (s) goto err;
+                        s = zbc_num_rem(&temp, c, d, 0);
+                        if (s) goto err;
+                }
+
+                s = zbc_num_mul(&base, &base, &temp, 0);
+                if (s) goto err;
+                s = zbc_num_rem(&temp, c, &base, 0);
+                if (s) goto err;
+        }
+ err:
+        bc_num_free(&temp);
+        bc_num_free(&exp);
+        bc_num_free(&base);
+        RETURN_STATUS(s);
+}
+#define zdc_num_modexp(...) (zdc_num_modexp(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_DC
+
+static FAST_FUNC void bc_string_free(void *string)
+{
+        free(*(char**)string);
+}
+
+static void bc_func_init(BcFunc *f)
+{
+        bc_char_vec_init(&f->code);
+        IF_BC(bc_vec_init(&f->labels, sizeof(size_t), NULL);)
+        IF_BC(bc_vec_init(&f->autos, sizeof(BcId), bc_id_free);)
+        IF_BC(bc_vec_init(&f->strs, sizeof(char *), bc_string_free);)
+        IF_BC(bc_vec_init(&f->consts, sizeof(char *), bc_string_free);)
+        IF_BC(f->nparams = 0;)
+}
+
+static FAST_FUNC void bc_func_free(void *func)
+{
+        BcFunc *f = (BcFunc *) func;
+        bc_vec_free(&f->code);
+        IF_BC(bc_vec_free(&f->labels);)
+        IF_BC(bc_vec_free(&f->autos);)
+        IF_BC(bc_vec_free(&f->strs);)
+        IF_BC(bc_vec_free(&f->consts);)
+}
+
+static void bc_array_expand(BcVec *a, size_t len);
+
+static void bc_array_init(BcVec *a, bool nums)
+{
+        if (nums)
+                bc_vec_init(a, sizeof(BcNum), bc_num_free);
+        else
+                bc_vec_init(a, sizeof(BcVec), bc_vec_free);
+        bc_array_expand(a, 1);
+}
+
+static void bc_array_expand(BcVec *a, size_t len)
+{
+        if (a->dtor == bc_num_free
+         // && a->size == sizeof(BcNum) - always true
+        ) {
+                BcNum n;
+                while (len > a->len) {
+                        bc_num_init_DEF_SIZE(&n);
+                        bc_vec_push(a, &n);
+                }
+        } else {
+                BcVec v;
+                while (len > a->len) {
+                        bc_array_init(&v, true);
+                        bc_vec_push(a, &v);
+                }
+        }
+}
+
+static void bc_array_copy(BcVec *d, const BcVec *s)
+{
+        BcNum *dnum, *snum;
+        size_t i;
+
+        bc_vec_pop_all(d);
+        bc_vec_expand(d, s->cap);
+        d->len = s->len;
+
+        dnum = (void*)d->v;
+        snum = (void*)s->v;
+        for (i = 0; i < s->len; i++, dnum++, snum++) {
+                bc_num_init(dnum, snum->len);
+                bc_num_copy(dnum, snum);
+        }
+}
+
+#if ENABLE_DC
+static void dc_result_copy(BcResult *d, BcResult *src)
+{
+        d->t = src->t;
+
+        switch (d->t) {
+                case XC_RESULT_TEMP:
+                case XC_RESULT_IBASE:
+                case XC_RESULT_SCALE:
+                case XC_RESULT_OBASE:
+                        bc_num_init(&d->d.n, src->d.n.len);
+                        bc_num_copy(&d->d.n, &src->d.n);
+                        break;
+                case XC_RESULT_VAR:
+                case XC_RESULT_ARRAY:
+                case XC_RESULT_ARRAY_ELEM:
+                        d->d.id.name = xstrdup(src->d.id.name);
+                        break;
+                case XC_RESULT_CONSTANT:
+                case XC_RESULT_STR:
+                        memcpy(&d->d.n, &src->d.n, sizeof(BcNum));
+                        break;
+                default: // placate compiler
+                        // BC_RESULT_VOID, BC_RESULT_LAST, BC_RESULT_ONE - do not happen
+                        break;
+        }
+}
+#endif // ENABLE_DC
+
+static FAST_FUNC void bc_result_free(void *result)
+{
+        BcResult *r = (BcResult *) result;
+
+        switch (r->t) {
+                case XC_RESULT_TEMP:
+                IF_BC(case BC_RESULT_VOID:)
+                case XC_RESULT_IBASE:
+                case XC_RESULT_SCALE:
+                case XC_RESULT_OBASE:
+                        bc_num_free(&r->d.n);
+                        break;
+                case XC_RESULT_VAR:
+                case XC_RESULT_ARRAY:
+                case XC_RESULT_ARRAY_ELEM:
+                        free(r->d.id.name);
+                        break;
+                default:
+                        // Do nothing.
+                        break;
+        }
+}
+
+static int bad_input_byte(char c)
+{
+        if ((c < ' ' && c != '\t' && c != '\r' && c != '\n') // also allow '\v' '\f'?
+         || c > 0x7e
+        ) {
+                bc_error_fmt("illegal character 0x%02x", c);
+                return 1;
+        }
+        return 0;
+}
+
+static void xc_read_line(BcVec *vec, FILE *fp)
+{
+ again:
+        bc_vec_pop_all(vec);
+        fflush_and_check();
+
+#if ENABLE_FEATURE_BC_INTERACTIVE
+        if (G_interrupt) { // ^C was pressed
+ intr:
+                if (fp != stdin) {
+                        // ^C while running a script (bc SCRIPT): die.
+                        // We do not return to interactive prompt:
+                        // user might be running us from a shell,
+                        // and SCRIPT might be intended to terminate
+                        // (e.g. contain a "halt" stmt).
+                        // ^C dropping user into a bc prompt instead of
+                        // the shell would be unexpected.
+                        xfunc_die();
+                }
+                // ^C while interactive input
+                G_interrupt = 0;
+                // GNU bc says "interrupted execution."
+                // GNU dc says "Interrupt!"
+                fputs("\ninterrupted execution\n", stderr);
+        }
+
+# if ENABLE_FEATURE_EDITING
+        if (G_ttyin && fp == stdin) {
+                int n, i;
+#  define line_buf bb_common_bufsiz1
+                n = read_line_input(G.line_input_state, "", line_buf, COMMON_BUFSIZE);
+                if (n <= 0) { // read errors or EOF, or ^D, or ^C
+                        if (n == 0) // ^C
+                                goto intr;
+                        bc_vec_pushZeroByte(vec); // ^D or EOF (or error)
+                        return;
+                }
+                i = 0;
+                for (;;) {
+                        char c = line_buf[i++];
+                        if (c == '\0') break;
+                        if (bad_input_byte(c)) goto again;
+                }
+                bc_vec_string(vec, n, line_buf);
+#  undef line_buf
+        } else
+# endif
+#endif
+        {
+                int c;
+                bool bad_chars = 0;
+
+                do {
+ get_char:
+#if ENABLE_FEATURE_BC_INTERACTIVE
+                        if (G_interrupt) {
+                                // ^C was pressed: ignore entire line, get another one
+                                goto again;
+                        }
+#endif
+                        c = fgetc(fp);
+                        if (c == '\0')
+                                goto get_char;
+                        if (c == EOF) {
+                                if (ferror(fp))
+                                        bb_perror_msg_and_die("input error");
+                                // Note: EOF does not append '\n'
+                                break;
+                        }
+                        bad_chars |= bad_input_byte(c);
+                        bc_vec_pushByte(vec, (char)c);
+                } while (c != '\n');
+
+                if (bad_chars) {
+                        // Bad chars on this line
+                        if (!G.prs.lex_filename) { // stdin
+                                // ignore entire line, get another one
+                                goto again;
+                        }
+                        bb_perror_msg_and_die("file '%s' is not text", G.prs.lex_filename);
+                }
+                bc_vec_pushZeroByte(vec);
+        }
+}
+
+//
+// Parsing routines
+//
+
+// "Input numbers may contain the characters 0-9 and A-Z.
+// (Note: They must be capitals.  Lower case letters are variable names.)
+// Single digit numbers always have the value of the digit regardless of
+// the value of ibase. (i.e. A = 10.) For multi-digit numbers, bc changes
+// all input digits greater or equal to ibase to the value of ibase-1.
+// This makes the number ZZZ always be the largest 3 digit number of the
+// input base."
+static bool xc_num_strValid(const char *val)
+{
+        bool radix = false;
+        for (;;) {
+                BcDig c = *val++;
+                if (c == '\0')
+                        break;
+                if (c == '.') {
+                        if (radix) return false;
+                        radix = true;
+                        continue;
+                }
+                if ((c < '0' || c > '9') && (c < 'A' || c > 'Z'))
+                        return false;
+        }
+        return true;
+}
+
+// Note: n is already "bc_num_zero()"ed,
+// leading zeroes in "val" are removed
+static void bc_num_parseDecimal(BcNum *n, const char *val)
+{
+        size_t len, i;
+        const char *ptr;
+
+        len = strlen(val);
+        if (len == 0)
+                return;
+
+        bc_num_expand(n, len + 1); // +1 for e.g. "A" converting into 10
+
+        ptr = strchr(val, '.');
+
+        n->rdx = 0;
+        if (ptr != NULL)
+                n->rdx = (size_t)((val + len) - (ptr + 1));
+
+        for (i = 0; val[i]; ++i) {
+                if (val[i] != '0' && val[i] != '.') {
+                        // Not entirely zero value - convert it, and exit
+                        if (len == 1) {
+                                unsigned c = val[0] - '0';
+                                n->len = 1;
+                                if (c > 9) { // A-Z => 10-36
+                                        n->len = 2;
+                                        c -= ('A' - '9' - 1);
+                                        n->num[1] = c/10;
+                                        c = c%10;
+                                }
+                                n->num[0] = c;
+                                break;
+                        }
+                        i = len - 1;
+                        for (;;) {
+                                char c = val[i] - '0';
+                                if (c > 9) // A-Z => 9
+                                        c = 9;
+                                n->num[n->len] = c;
+                                n->len++;
+ skip_dot:
+                                if (i == 0) break;
+                                if (val[--i] == '.') goto skip_dot;
+                        }
+                        break;
+                }
+        }
+        // if for() exits without hitting if(), the value is entirely zero
+}
+
+// Note: n is already "bc_num_zero()"ed,
+// leading zeroes in "val" are removed
+static void bc_num_parseBase(BcNum *n, const char *val, unsigned base_t)
+{
+        BcStatus s;
+        BcNum mult, result;
+        BcNum temp;
+        BcNum base;
+        BcDig temp_digs[ULONG_NUM_BUFSIZE];
+        BcDig base_digs[ULONG_NUM_BUFSIZE];
+        size_t digits;
+
+        bc_num_init_DEF_SIZE(&mult);
+
+        temp.cap = ARRAY_SIZE(temp_digs);
+        temp.num = temp_digs;
+
+        base.cap = ARRAY_SIZE(base_digs);
+        base.num = base_digs;
+        bc_num_ulong2num(&base, base_t);
+        base_t--;
+
+        for (;;) {
+                unsigned v;
+                char c;
+
+                c = *val++;
+                if (c == '\0') goto int_err;
+                if (c == '.') break;
+
+                v = (unsigned)(c <= '9' ? c - '0' : c - 'A' + 10);
+                if (v > base_t) v = base_t;
+
+                s = zbc_num_mul(n, &base, &mult, 0);
+                if (s) goto int_err;
+                bc_num_ulong2num(&temp, v);
+                s = zbc_num_add(&mult, &temp, n, 0);
+                if (s) goto int_err;
+        }
+
+        bc_num_init(&result, base.len);
+        //bc_num_zero(&result); - already is
+        bc_num_one(&mult);
+
+        digits = 0;
+        for (;;) {
+                unsigned v;
+                char c;
+
+                c = *val++;
+                if (c == '\0') break;
+                digits++;
+
+                v = (unsigned)(c <= '9' ? c - '0' : c - 'A' + 10);
+                if (v > base_t) v = base_t;
+
+                s = zbc_num_mul(&result, &base, &result, 0);
+                if (s) goto err;
+                bc_num_ulong2num(&temp, v);
+                s = zbc_num_add(&result, &temp, &result, 0);
+                if (s) goto err;
+                s = zbc_num_mul(&mult, &base, &mult, 0);
+                if (s) goto err;
+        }
+
+        s = zbc_num_div(&result, &mult, &result, digits);
+        if (s) goto err;
+        s = zbc_num_add(n, &result, n, digits);
+        if (s) goto err;
+
+        if (n->len != 0) {
+                if (n->rdx < digits)
+                        bc_num_extend(n, digits - n->rdx);
+        } else
+                bc_num_zero(n);
+ err:
+        bc_num_free(&result);
+ int_err:
+        bc_num_free(&mult);
+}
+
+static BC_STATUS zxc_num_parse(BcNum *n, const char *val, unsigned base_t)
+{
+        size_t i;
+
+        if (!xc_num_strValid(val))
+                RETURN_STATUS(bc_error("bad number string"));
+
+        bc_num_zero(n);
+        while (*val == '0')
+                val++;
+        for (i = 0; ; ++i) {
+                if (val[i] == '\0')
+                        RETURN_STATUS(BC_STATUS_SUCCESS);
+                if (val[i] != '.' && val[i] != '0')
+                        break;
+        }
+
+        if (base_t == 10 || val[1] == '\0')
+                // Decimal, or single-digit number
+                bc_num_parseDecimal(n, val);
+        else
+                bc_num_parseBase(n, val, base_t);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zxc_num_parse(...) (zxc_num_parse(__VA_ARGS__) COMMA_SUCCESS)
+
+// p->lex_inbuf points to the current string to be parsed.
+// if p->lex_inbuf points to '\0', it's either EOF or it points after
+// last processed line's terminating '\n' (and more reading needs to be done
+// to get next character).
+//
+// If you are in a situation where that is a possibility, call peek_inbuf().
+// If necessary, it performs more reading and changes p->lex_inbuf,
+// then it returns *p->lex_inbuf (which will be '\0' only if it's EOF).
+// After it, just referencing *p->lex_inbuf is valid, and if it wasn't '\0',
+// it's ok to do p->lex_inbuf++ once without end-of-buffer checking.
+//
+// eat_inbuf() is equvalent to "peek_inbuf(); if (c) p->lex_inbuf++":
+// it returns current char and advances the pointer (if not EOF).
+// After eat_inbuf(), referencing p->lex_inbuf[-1] and *p->lex_inbuf is valid.
+//
+// In many cases, you can use fast *p->lex_inbuf instead of peek_inbuf():
+// unless prev char might have been '\n', *p->lex_inbuf is '\0' ONLY
+// on real EOF, not end-of-buffer.
+//
+// bc cases to test interactively:
+// 1 #comment\  - prints "1<newline>" at once (comment is not continued)
+// 1 #comment/* - prints "1<newline>" at once
+// 1 #comment"  - prints "1<newline>" at once
+// 1\#comment   - error at once (\ is not a line continuation)
+// 1 + /*"*/2   - prints "3<newline>" at once
+// 1 + /*#*/2   - prints "3<newline>" at once
+// "str\"       - prints "str\" at once
+// "str#"       - prints "str#" at once
+// "str/*"      - prints "str/*" at once
+// "str#\       - waits for second line
+// end"         - ...prints "str#\<newline>end"
+static char peek_inbuf(void)
+{
+        if (*G.prs.lex_inbuf == '\0'
+         && G.prs.lex_input_fp
+        ) {
+                xc_read_line(&G.input_buffer, G.prs.lex_input_fp);
+                G.prs.lex_inbuf = G.input_buffer.v;
+                if (G.input_buffer.len <= 1) // on EOF, len is 1 (NUL byte)
+                        G.prs.lex_input_fp = NULL;
+        }
+        return *G.prs.lex_inbuf;
+}
+static char eat_inbuf(void)
+{
+        char c = peek_inbuf();
+        if (c) G.prs.lex_inbuf++;
+        return c;
+}
+
+static void xc_lex_lineComment(void)
+{
+        BcParse *p = &G.prs;
+        char c;
+
+        // Try: echo -n '#foo' | bc
+        p->lex = XC_LEX_WHITESPACE;
+
+        // Not peek_inbuf(): we depend on input being done in whole lines:
+        // '\0' which isn't the EOF can only be seen after '\n'.
+        while ((c = *p->lex_inbuf) != '\n' && c != '\0')
+                p->lex_inbuf++;
+}
+
+static void xc_lex_whitespace(void)
+{
+        BcParse *p = &G.prs;
+
+        p->lex = XC_LEX_WHITESPACE;
+        for (;;) {
+                // We depend here on input being done in whole lines:
+                // '\0' which isn't the EOF can only be seen after '\n'.
+                char c = *p->lex_inbuf;
+                if (c == '\n') // this is XC_LEX_NLINE, not XC_LEX_WHITESPACE
+                        break;
+                if (!isspace(c))
+                        break;
+                p->lex_inbuf++;
+        }
+}
+
+static BC_STATUS zxc_lex_number(char last)
+{
+        BcParse *p = &G.prs;
+        bool pt;
+        char last_valid_ch;
+
+        bc_vec_pop_all(&p->lex_strnumbuf);
+        bc_vec_pushByte(&p->lex_strnumbuf, last);
+
+// bc: "Input numbers may contain the characters 0-9 and A-Z.
+// (Note: They must be capitals.  Lower case letters are variable names.)
+// Single digit numbers always have the value of the digit regardless of
+// the value of ibase. (i.e. A = 10.) For multi-digit numbers, bc changes
+// all input digits greater or equal to ibase to the value of ibase-1.
+// This makes the number ZZZ always be the largest 3 digit number of the
+// input base."
+// dc only allows A-F, the rules about single-char and multi-char are the same.
+        last_valid_ch = (IS_BC ? 'Z' : 'F');
+        pt = (last == '.');
+        p->lex = XC_LEX_NUMBER;
+        for (;;) {
+                // We depend here on input being done in whole lines:
+                // '\0' which isn't the EOF can only be seen after '\n'.
+                char c = *p->lex_inbuf;
+ check_c:
+                if (c == '\0')
+                        break;
+                if (c == '\\' && p->lex_inbuf[1] == '\n') {
+                        p->lex_inbuf += 2;
+                        p->lex_line++;
+                        dbg_lex("++p->lex_line=%zd", p->lex_line);
+                        c = peek_inbuf(); // force next line to be read
+                        goto check_c;
+                }
+                if (!isdigit(c) && (c < 'A' || c > last_valid_ch)) {
+                        if (c != '.') break;
+                        // if '.' was already seen, stop on second one:
+                        if (pt) break;
+                        pt = true;
+                }
+                // c is one of "0-9A-Z."
+                last = c;
+                bc_vec_push(&p->lex_strnumbuf, p->lex_inbuf);
+                p->lex_inbuf++;
+        }
+        if (last == '.') // remove trailing '.' if any
+                bc_vec_pop(&p->lex_strnumbuf);
+        bc_vec_pushZeroByte(&p->lex_strnumbuf);
+
+        G.err_line = G.prs.lex_line;
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zxc_lex_number(...) (zxc_lex_number(__VA_ARGS__) COMMA_SUCCESS)
+
+static void xc_lex_name(void)
+{
+        BcParse *p = &G.prs;
+        size_t i;
+        const char *buf;
+
+        p->lex = XC_LEX_NAME;
+
+        // Since names can't cross lines with \<newline>,
+        // we depend on the fact that whole line is in the buffer
+        i = 0;
+        buf = p->lex_inbuf - 1;
+        for (;;) {
+                char c = buf[i];
+                if ((c < 'a' || c > 'z') && !isdigit(c) && c != '_') break;
+                i++;
+        }
+
+#if 0 // We do not protect against people with gigabyte-long names
+        // This check makes sense only if size_t is (much) larger than BC_MAX_STRING.
+        if (SIZE_MAX > (BC_MAX_STRING | 0xff)) {
+                if (i > BC_MAX_STRING)
+                        return bc_error("name too long: must be [1,"BC_MAX_STRING_STR"]");
+        }
+#endif
+        bc_vec_string(&p->lex_strnumbuf, i, buf);
+
+        // Increment the index. We minus 1 because it has already been incremented.
+        p->lex_inbuf += i - 1;
+
+        //return BC_STATUS_SUCCESS;
+}
+
+IF_BC(static BC_STATUS zbc_lex_token(void);)
+IF_DC(static BC_STATUS zdc_lex_token(void);)
+#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
+#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_lex_next(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        G.err_line = p->lex_line;
+        p->lex_last = p->lex;
+//why?
+//      if (p->lex_last == XC_LEX_EOF)
+//              RETURN_STATUS(bc_error("end of file"));
+
+        // Loop until failure or we don't have whitespace. This
+        // is so the parser doesn't get inundated with whitespace.
+        // Comments are also XC_LEX_WHITESPACE tokens and eaten here.
+        s = BC_STATUS_SUCCESS;
+        do {
+                if (*p->lex_inbuf == '\0') {
+                        p->lex = XC_LEX_EOF;
+                        if (peek_inbuf() == '\0')
+                                RETURN_STATUS(BC_STATUS_SUCCESS);
+                }
+                p->lex_next_at = p->lex_inbuf;
+                dbg_lex("next string to parse:'%.*s'",
+                        (int)(strchrnul(p->lex_next_at, '\n') - p->lex_next_at),
+                        p->lex_next_at
+                );
+                if (IS_BC) {
+                        IF_BC(s = zbc_lex_token());
+                } else {
+                        IF_DC(s = zdc_lex_token());
+                }
+        } while (!s && p->lex == XC_LEX_WHITESPACE);
+        dbg_lex("p->lex from string:%d", p->lex);
+
+        RETURN_STATUS(s);
+}
+#define zxc_lex_next(...) (zxc_lex_next(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_BC
+static BC_STATUS zbc_lex_skip_if_at_NLINE(void)
+{
+        if (G.prs.lex == XC_LEX_NLINE)
+                RETURN_STATUS(zxc_lex_next());
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_lex_skip_if_at_NLINE(...) (zbc_lex_skip_if_at_NLINE(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_lex_next_and_skip_NLINE(void)
+{
+        BcStatus s;
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        // if(cond)<newline>stmt is accepted too (but not 2+ newlines)
+        s = zbc_lex_skip_if_at_NLINE();
+        RETURN_STATUS(s);
+}
+#define zbc_lex_next_and_skip_NLINE(...) (zbc_lex_next_and_skip_NLINE(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_lex_identifier(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        unsigned i;
+        const char *buf = p->lex_inbuf - 1;
+
+        for (i = 0; i < ARRAY_SIZE(bc_lex_kws); ++i) {
+                const char *keyword8 = bc_lex_kws[i].name8;
+                unsigned j = 0;
+                while (buf[j] != '\0' && buf[j] == keyword8[j]) {
+                        j++;
+                        if (j == 8) goto match;
+                }
+                if (keyword8[j] != '\0')
+                        continue;
+ match:
+                // buf starts with keyword bc_lex_kws[i]
+                if (isalnum(buf[j]) || buf[j]=='_')
+                        continue; // "ifz" does not match "if" keyword, "if." does
+                p->lex = BC_LEX_KEY_1st_keyword + i;
+                if (!keyword_is_POSIX(i)) {
+                        s = zbc_posix_error_fmt("%sthe '%.8s' keyword", "POSIX does not allow ", bc_lex_kws[i].name8);
+                        if (s) RETURN_STATUS(s);
+                }
+
+                // We minus 1 because the index has already been incremented.
+                p->lex_inbuf += j - 1;
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        xc_lex_name();
+        s = BC_STATUS_SUCCESS;
+
+        if (p->lex_strnumbuf.len > 2) {
+                // Prevent this:
+                // >>> qwe=1
+                // bc: POSIX only allows one character names; this is bad: 'qwe=1
+                // '
+                unsigned len = strchrnul(buf, '\n') - buf;
+                s = zbc_posix_error_fmt("POSIX only allows one character names; this is bad: '%.*s'", len, buf);
+        }
+
+        RETURN_STATUS(s);
+}
+#define zbc_lex_identifier(...) (zbc_lex_identifier(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_lex_string(void)
+{
+        BcParse *p = &G.prs;
+
+        p->lex = XC_LEX_STR;
+        bc_vec_pop_all(&p->lex_strnumbuf);
+        for (;;) {
+                char c = peek_inbuf(); // strings can cross lines
+                if (c == '\0') {
+                        RETURN_STATUS(bc_error("unterminated string"));
+                }
+                if (c == '"')
+                        break;
+                if (c == '\n') {
+                        p->lex_line++;
+                        dbg_lex("++p->lex_line=%zd", p->lex_line);
+                }
+                bc_vec_push(&p->lex_strnumbuf, p->lex_inbuf);
+                p->lex_inbuf++;
+        }
+        bc_vec_pushZeroByte(&p->lex_strnumbuf);
+        p->lex_inbuf++;
+
+        G.err_line = p->lex_line;
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_lex_string(...) (zbc_lex_string(__VA_ARGS__) COMMA_SUCCESS)
+
+static void parse_lex_by_checking_eq_sign(unsigned with_and_without)
+{
+        BcParse *p = &G.prs;
+        if (*p->lex_inbuf == '=') {
+                // ^^^ not using peek_inbuf() since '==' etc can't be split across lines
+                p->lex_inbuf++;
+                with_and_without >>= 8; // store "with" value
+        } // else store "without" value
+        p->lex = (with_and_without & 0xff);
+}
+#define parse_lex_by_checking_eq_sign(with, without) \
+        parse_lex_by_checking_eq_sign(((with)<<8)|(without))
+
+static BC_STATUS zbc_lex_comment(void)
+{
+        BcParse *p = &G.prs;
+
+        p->lex = XC_LEX_WHITESPACE;
+        // here lex_inbuf is at '*' of opening comment delimiter
+        for (;;) {
+                char c;
+
+                p->lex_inbuf++;
+                c = peek_inbuf();
+ check_star:
+                if (c == '*') {
+                        p->lex_inbuf++;
+                        c = *p->lex_inbuf; // no need to peek_inbuf()
+                        if (c == '/')
+                                break;
+                        goto check_star;
+                }
+                if (c == '\0') {
+                        RETURN_STATUS(bc_error("unterminated comment"));
+                }
+                if (c == '\n') {
+                        p->lex_line++;
+                        dbg_lex("++p->lex_line=%zd", p->lex_line);
+                }
+        }
+        p->lex_inbuf++; // skip trailing '/'
+
+        G.err_line = p->lex_line;
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_lex_comment(...) (zbc_lex_comment(__VA_ARGS__) COMMA_SUCCESS)
+
+#undef zbc_lex_token
+static BC_STATUS zbc_lex_token(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s = BC_STATUS_SUCCESS;
+        char c = eat_inbuf();
+        char c2;
+
+        // This is the workhorse of the lexer.
+        switch (c) {
+//      case '\0': // probably never reached
+//              p->lex_inbuf--;
+//              p->lex = XC_LEX_EOF;
+//              break;
+        case '\n':
+                p->lex_line++;
+                dbg_lex("++p->lex_line=%zd", p->lex_line);
+                p->lex = XC_LEX_NLINE;
+                break;
+        case '\t':
+        case '\v':
+        case '\f':
+        case '\r':
+        case ' ':
+                xc_lex_whitespace();
+                break;
+        case '!':
+                parse_lex_by_checking_eq_sign(XC_LEX_OP_REL_NE, BC_LEX_OP_BOOL_NOT);
+                if (p->lex == BC_LEX_OP_BOOL_NOT) {
+                        s = zbc_POSIX_does_not_allow_bool_ops_this_is_bad("!");
+                        if (s) RETURN_STATUS(s);
+                }
+                break;
+        case '"':
+                s = zbc_lex_string();
+                break;
+        case '#':
+                s = zbc_POSIX_does_not_allow("'#' script comments");
+                if (s) RETURN_STATUS(s);
+                xc_lex_lineComment();
+                break;
+        case '%':
+                parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_MODULUS, XC_LEX_OP_MODULUS);
+                break;
+        case '&':
+                c2 = *p->lex_inbuf;
+                if (c2 == '&') {
+                        s = zbc_POSIX_does_not_allow_bool_ops_this_is_bad("&&");
+                        if (s) RETURN_STATUS(s);
+                        p->lex_inbuf++;
+                        p->lex = BC_LEX_OP_BOOL_AND;
+                } else {
+                        p->lex = XC_LEX_INVALID;
+                        s = bc_error_bad_character('&');
+                }
+                break;
+        case '(':
+        case ')':
+                p->lex = (BcLexType)(c - '(' + BC_LEX_LPAREN);
+                break;
+        case '*':
+                parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_MULTIPLY, XC_LEX_OP_MULTIPLY);
+                break;
+        case '+':
+                c2 = *p->lex_inbuf;
+                if (c2 == '+') {
+                        p->lex_inbuf++;
+                        p->lex = BC_LEX_OP_INC;
+                } else
+                        parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_PLUS, XC_LEX_OP_PLUS);
+                break;
+        case ',':
+                p->lex = BC_LEX_COMMA;
+                break;
+        case '-':
+                c2 = *p->lex_inbuf;
+                if (c2 == '-') {
+                        p->lex_inbuf++;
+                        p->lex = BC_LEX_OP_DEC;
+                } else
+                        parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_MINUS, XC_LEX_OP_MINUS);
+                break;
+        case '.':
+                if (isdigit(*p->lex_inbuf))
+                        s = zxc_lex_number(c);
+                else {
+                        p->lex = BC_LEX_KEY_LAST;
+                        s = zbc_POSIX_does_not_allow("'.' as 'last'");
+                }
+                break;
+        case '/':
+                c2 = *p->lex_inbuf;
+                if (c2 == '*')
+                        s = zbc_lex_comment();
+                else
+                        parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_DIVIDE, XC_LEX_OP_DIVIDE);
+                break;
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+        case 'A':
+        case 'B':
+        case 'C':
+        case 'D':
+        case 'E':
+        case 'F':
+        case 'G':
+        case 'H':
+        case 'I':
+        case 'J':
+        case 'K':
+        case 'L':
+        case 'M':
+        case 'N':
+        case 'O':
+        case 'P':
+        case 'Q':
+        case 'R':
+        case 'S':
+        case 'T':
+        case 'U':
+        case 'V':
+        case 'W':
+        case 'X':
+        case 'Y':
+        case 'Z':
+                s = zxc_lex_number(c);
+                break;
+        case ';':
+                p->lex = BC_LEX_SCOLON;
+                break;
+        case '<':
+                parse_lex_by_checking_eq_sign(XC_LEX_OP_REL_LE, XC_LEX_OP_REL_LT);
+                break;
+        case '=':
+                parse_lex_by_checking_eq_sign(XC_LEX_OP_REL_EQ, BC_LEX_OP_ASSIGN);
+                break;
+        case '>':
+                parse_lex_by_checking_eq_sign(XC_LEX_OP_REL_GE, XC_LEX_OP_REL_GT);
+                break;
+        case '[':
+        case ']':
+                p->lex = (BcLexType)(c - '[' + BC_LEX_LBRACKET);
+                break;
+        case '\\':
+                if (*p->lex_inbuf == '\n') {
+                        p->lex = XC_LEX_WHITESPACE;
+                        p->lex_inbuf++;
+                } else
+                        s = bc_error_bad_character(c);
+                break;
+        case '^':
+                parse_lex_by_checking_eq_sign(BC_LEX_OP_ASSIGN_POWER, XC_LEX_OP_POWER);
+                break;
+        case 'a':
+        case 'b':
+        case 'c':
+        case 'd':
+        case 'e':
+        case 'f':
+        case 'g':
+        case 'h':
+        case 'i':
+        case 'j':
+        case 'k':
+        case 'l':
+        case 'm':
+        case 'n':
+        case 'o':
+        case 'p':
+        case 'q':
+        case 'r':
+        case 's':
+        case 't':
+        case 'u':
+        case 'v':
+        case 'w':
+        case 'x':
+        case 'y':
+        case 'z':
+                s = zbc_lex_identifier();
+                break;
+        case '{':
+        case '}':
+                p->lex = (BcLexType)(c - '{' + BC_LEX_LBRACE);
+                break;
+        case '|':
+                c2 = *p->lex_inbuf;
+                if (c2 == '|') {
+                        s = zbc_POSIX_does_not_allow_bool_ops_this_is_bad("||");
+                        if (s) RETURN_STATUS(s);
+                        p->lex_inbuf++;
+                        p->lex = BC_LEX_OP_BOOL_OR;
+                } else {
+                        p->lex = XC_LEX_INVALID;
+                        s = bc_error_bad_character(c);
+                }
+                break;
+        default:
+                p->lex = XC_LEX_INVALID;
+                s = bc_error_bad_character(c);
+                break;
+        }
+
+        RETURN_STATUS(s);
+}
+#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_BC
+
+#if ENABLE_DC
+static BC_STATUS zdc_lex_register(void)
+{
+        BcParse *p = &G.prs;
+        if (G_exreg && isspace(*p->lex_inbuf)) {
+                xc_lex_whitespace(); // eats whitespace (but not newline)
+                p->lex_inbuf++; // xc_lex_name() expects this
+                xc_lex_name();
+        } else {
+                bc_vec_pop_all(&p->lex_strnumbuf);
+                bc_vec_push(&p->lex_strnumbuf, p->lex_inbuf++);
+                bc_vec_pushZeroByte(&p->lex_strnumbuf);
+                p->lex = XC_LEX_NAME;
+        }
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zdc_lex_register(...) (zdc_lex_register(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_lex_string(void)
+{
+        BcParse *p = &G.prs;
+        size_t depth;
+
+        p->lex = XC_LEX_STR;
+        bc_vec_pop_all(&p->lex_strnumbuf);
+
+        depth = 1;
+        for (;;) {
+                char c = peek_inbuf();
+                if (c == '\0') {
+                        RETURN_STATUS(bc_error("unterminated string"));
+                }
+                if (c == '[') depth++;
+                if (c == ']')
+                        if (--depth == 0)
+                                break;
+                if (c == '\n') {
+                        p->lex_line++;
+                        dbg_lex("++p->lex_line=%zd", p->lex_line);
+                }
+                bc_vec_push(&p->lex_strnumbuf, p->lex_inbuf);
+                p->lex_inbuf++;
+        }
+        bc_vec_pushZeroByte(&p->lex_strnumbuf);
+        p->lex_inbuf++; // skip trailing ']'
+
+        G.err_line = p->lex_line;
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zdc_lex_string(...) (zdc_lex_string(__VA_ARGS__) COMMA_SUCCESS)
+
+#undef zdc_lex_token
+static BC_STATUS zdc_lex_token(void)
+{
+        static const //BcLexType - should be this type, but narrower type saves size:
+        uint8_t
+        dc_lex_regs[] ALIGN1 = {
+                XC_LEX_OP_REL_EQ, XC_LEX_OP_REL_LE, XC_LEX_OP_REL_GE, XC_LEX_OP_REL_NE,
+                XC_LEX_OP_REL_LT, XC_LEX_OP_REL_GT, DC_LEX_SCOLON, DC_LEX_COLON,
+                DC_LEX_ELSE, DC_LEX_LOAD, DC_LEX_LOAD_POP, DC_LEX_OP_ASSIGN,
+                DC_LEX_STORE_PUSH,
+        };
+
+        BcParse *p = &G.prs;
+        BcStatus s;
+        char c, c2;
+        size_t i;
+
+        for (i = 0; i < ARRAY_SIZE(dc_lex_regs); ++i) {
+                if (p->lex_last == dc_lex_regs[i])
+                        RETURN_STATUS(zdc_lex_register());
+        }
+
+        s = BC_STATUS_SUCCESS;
+        c = eat_inbuf();
+        if (c >= '%' && c <= '~'
+         && (p->lex = dc_char_to_LEX[c - '%']) != XC_LEX_INVALID
+        ) {
+                RETURN_STATUS(s);
+        }
+
+        // This is the workhorse of the lexer.
+        switch (c) {
+//      case '\0': // probably never reached
+//              p->lex = XC_LEX_EOF;
+//              break;
+        case '\n':
+                // '\n' is XC_LEX_NLINE, not XC_LEX_WHITESPACE
+                // (and "case '\n':" is not just empty here)
+                // only to allow interactive dc have a way to exit
+                // "parse" stage of "parse,execute" loop
+                // on <enter>, not on _next_ token (which would mean
+                // commands are not executed on pressing <enter>).
+                // IOW: typing "1p<enter>" should print "1" _at once_,
+                // not after some more input.
+                p->lex_line++;
+                dbg_lex("++p->lex_line=%zd", p->lex_line);
+                p->lex = XC_LEX_NLINE;
+                break;
+        case '\t':
+        case '\v':
+        case '\f':
+        case '\r':
+        case ' ':
+                xc_lex_whitespace();
+                break;
+        case '!':
+                c2 = *p->lex_inbuf;
+                if (c2 == '=')
+                        p->lex = XC_LEX_OP_REL_NE;
+                else if (c2 == '<')
+                        p->lex = XC_LEX_OP_REL_LE;
+                else if (c2 == '>')
+                        p->lex = XC_LEX_OP_REL_GE;
+                else
+                        RETURN_STATUS(bc_error_bad_character(c));
+                p->lex_inbuf++;
+                break;
+        case '#':
+                xc_lex_lineComment();
+                break;
+        case '.':
+                if (isdigit(*p->lex_inbuf))
+                        s = zxc_lex_number(c);
+                else
+                        s = bc_error_bad_character(c);
+                break;
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+        case 'A':
+        case 'B':
+        case 'C':
+        case 'D':
+        case 'E':
+        case 'F':
+                s = zxc_lex_number(c);
+                break;
+        case '[':
+                s = zdc_lex_string();
+                break;
+        default:
+                p->lex = XC_LEX_INVALID;
+                s = bc_error_bad_character(c);
+                break;
+        }
+
+        RETURN_STATUS(s);
+}
+#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_DC
+
+static void xc_parse_push(unsigned i)
+{
+        BcVec *code = &G.prs.func->code;
+        dbg_compile("%s:%d pushing bytecode %zd:%d", __func__, __LINE__, code->len, i);
+        bc_vec_pushByte(code, (uint8_t)i);
+}
+
+static void xc_parse_pushName(char *name)
+{
+#if 1
+        BcVec *code = &G.prs.func->code;
+        size_t pos = code->len;
+        size_t len = strlen(name) + 1;
+
+        bc_vec_expand(code, pos + len);
+        strcpy(code->v + pos, name);
+        code->len = pos + len;
+#else
+        // Smaller code, but way slow:
+        do {
+                xc_parse_push(*name);
+        } while (*name++);
+#endif
+}
+
+// Indexes < 0xfc are encoded verbatim, else first byte is
+// 0xfc, 0xfd, 0xfe or 0xff, encoding "1..4 bytes",
+// followed by that many bytes, lsb first.
+// (The above describes 32-bit case).
+#define SMALL_INDEX_LIMIT (0x100 - sizeof(size_t))
+
+static void xc_parse_pushIndex(size_t idx)
+{
+        size_t mask;
+        unsigned amt;
+
+        dbg_lex("%s:%d pushing index %zd", __func__, __LINE__, idx);
+        if (idx < SMALL_INDEX_LIMIT) {
+                xc_parse_push(idx);
+                return;
+        }
+
+        mask = ((size_t)0xff) << (sizeof(idx) * 8 - 8);
+        amt = sizeof(idx);
+        for (;;) {
+                if (idx & mask) break;
+                mask >>= 8;
+                amt--;
+        }
+        // amt is at least 1 here - "one byte of length data follows"
+
+        xc_parse_push((SMALL_INDEX_LIMIT - 1) + amt);
+
+        do {
+                xc_parse_push((unsigned char)idx);
+                idx >>= 8;
+        } while (idx != 0);
+}
+
+static void xc_parse_pushInst_and_Index(unsigned inst, size_t idx)
+{
+        xc_parse_push(inst);
+        xc_parse_pushIndex(idx);
+}
+
+#if ENABLE_BC
+static void bc_parse_pushJUMP(size_t idx)
+{
+        xc_parse_pushInst_and_Index(BC_INST_JUMP, idx);
+}
+
+static void bc_parse_pushJUMP_ZERO(size_t idx)
+{
+        xc_parse_pushInst_and_Index(BC_INST_JUMP_ZERO, idx);
+}
+
+static BC_STATUS zbc_parse_pushSTR(void)
+{
+        BcParse *p = &G.prs;
+        char *str = xstrdup(p->lex_strnumbuf.v);
+
+        xc_parse_pushInst_and_Index(XC_INST_STR, p->func->strs.len);
+        bc_vec_push(&p->func->strs, &str);
+
+        RETURN_STATUS(zxc_lex_next());
+}
+#define zbc_parse_pushSTR(...) (zbc_parse_pushSTR(__VA_ARGS__) COMMA_SUCCESS)
+#endif
+
+static void xc_parse_pushNUM(void)
+{
+        BcParse *p = &G.prs;
+        char *num = xstrdup(p->lex_strnumbuf.v);
+#if ENABLE_BC && ENABLE_DC
+        size_t idx = bc_vec_push(IS_BC ? &p->func->consts : &G.prog.consts, &num);
+#elif ENABLE_BC
+        size_t idx = bc_vec_push(&p->func->consts, &num);
+#else // DC
+        size_t idx = bc_vec_push(&G.prog.consts, &num);
+#endif
+        xc_parse_pushInst_and_Index(XC_INST_NUM, idx);
+}
+
+static BC_STATUS zxc_parse_text_init(const char *text)
+{
+        G.prs.func = xc_program_func(G.prs.fidx);
+        G.prs.lex_inbuf = text;
+        G.prs.lex = G.prs.lex_last = XC_LEX_INVALID;
+        RETURN_STATUS(zxc_lex_next());
+}
+#define zxc_parse_text_init(...) (zxc_parse_text_init(__VA_ARGS__) COMMA_SUCCESS)
+
+// Called when parsing or execution detects a failure,
+// resets execution structures.
+static void xc_program_reset(void)
+{
+        BcFunc *f;
+        BcInstPtr *ip;
+
+        bc_vec_npop(&G.prog.exestack, G.prog.exestack.len - 1);
+        bc_vec_pop_all(&G.prog.results);
+
+        f = xc_program_func_BC_PROG_MAIN();
+        ip = bc_vec_top(&G.prog.exestack);
+        ip->inst_idx = f->code.len;
+}
+
+// Called when parsing code detects a failure,
+// resets parsing structures.
+static void xc_parse_reset(void)
+{
+        BcParse *p = &G.prs;
+        if (p->fidx != BC_PROG_MAIN) {
+                bc_func_free(p->func);
+                bc_func_init(p->func);
+
+                p->fidx = BC_PROG_MAIN;
+                p->func = xc_program_func_BC_PROG_MAIN();
+        }
+
+        p->lex_inbuf += strlen(p->lex_inbuf);
+        p->lex = XC_LEX_EOF;
+
+        IF_BC(bc_vec_pop_all(&p->exits);)
+        IF_BC(bc_vec_pop_all(&p->conds);)
+        IF_BC(bc_vec_pop_all(&p->ops);)
+
+        xc_program_reset();
+}
+
+static void xc_parse_free(void)
+{
+        IF_BC(bc_vec_free(&G.prs.exits);)
+        IF_BC(bc_vec_free(&G.prs.conds);)
+        IF_BC(bc_vec_free(&G.prs.ops);)
+        bc_vec_free(&G.prs.lex_strnumbuf);
+}
+
+static void xc_parse_create(size_t fidx)
+{
+        BcParse *p = &G.prs;
+        memset(p, 0, sizeof(BcParse));
+
+        bc_char_vec_init(&p->lex_strnumbuf);
+        IF_BC(bc_vec_init(&p->exits, sizeof(size_t), NULL);)
+        IF_BC(bc_vec_init(&p->conds, sizeof(size_t), NULL);)
+        IF_BC(bc_vec_init(&p->ops, sizeof(BcLexType), NULL);)
+
+        p->fidx = fidx;
+        p->func = xc_program_func(fidx);
+}
+
+static void xc_program_add_fn(void)
+{
+        //size_t idx;
+        BcFunc f;
+        bc_func_init(&f);
+        //idx =
+        bc_vec_push(&G.prog.fns, &f);
+        //return idx;
+}
+
+#if ENABLE_BC
+
+// Note: takes ownership of 'name' (must be malloced)
+static size_t bc_program_addFunc(char *name)
+{
+        size_t idx;
+        BcId entry, *entry_ptr;
+        int inserted;
+
+        entry.name = name;
+        entry.idx = G.prog.fns.len;
+
+        inserted = bc_map_insert(&G.prog.fn_map, &entry, &idx);
+        if (!inserted) free(name);
+
+        entry_ptr = bc_vec_item(&G.prog.fn_map, idx);
+        idx = entry_ptr->idx;
+
+        if (!inserted) {
+                // There is already a function with this name.
+                // It'll be redefined now, clear old definition.
+                BcFunc *func = xc_program_func(entry_ptr->idx);
+                bc_func_free(func);
+                bc_func_init(func);
+        } else {
+                xc_program_add_fn();
+        }
+
+        return idx;
+}
+
+#define BC_PARSE_TOP_OP(p) (*(BcLexType*)bc_vec_top(&(p)->ops))
+// We can calculate the conversion between tokens and exprs by subtracting the
+// position of the first operator in the lex enum and adding the position of the
+// first in the expr enum. Note: This only works for binary operators.
+#define BC_TOKEN_2_INST(t) ((char) ((t) - XC_LEX_OP_POWER + XC_INST_POWER))
+
+static BC_STATUS zbc_parse_expr(uint8_t flags);
+#define zbc_parse_expr(...) (zbc_parse_expr(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_stmt_possibly_auto(bool auto_allowed);
+#define zbc_parse_stmt_possibly_auto(...) (zbc_parse_stmt_possibly_auto(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_stmt(void)
+{
+        RETURN_STATUS(zbc_parse_stmt_possibly_auto(false));
+}
+#define zbc_parse_stmt(...) (zbc_parse_stmt(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_stmt_allow_NLINE_before(const char *after_X)
+{
+        BcParse *p = &G.prs;
+        // "if(cond)<newline>stmt" is accepted too, but not 2+ newlines.
+        // Same for "else", "while()", "for()".
+        BcStatus s = zbc_lex_next_and_skip_NLINE();
+        if (s) RETURN_STATUS(s);
+        if (p->lex == XC_LEX_NLINE)
+                RETURN_STATUS(bc_error_fmt("no statement after '%s'", after_X));
+
+        RETURN_STATUS(zbc_parse_stmt());
+}
+#define zbc_parse_stmt_allow_NLINE_before(...) (zbc_parse_stmt_allow_NLINE_before(__VA_ARGS__) COMMA_SUCCESS)
+
+static void bc_parse_operator(BcLexType type, size_t start, size_t *nexprs)
+{
+        BcParse *p = &G.prs;
+        char l, r = bc_operation_PREC(type - XC_LEX_1st_op);
+        bool left = bc_operation_LEFT(type - XC_LEX_1st_op);
+
+        while (p->ops.len > start) {
+                BcLexType t = BC_PARSE_TOP_OP(p);
+                if (t == BC_LEX_LPAREN) break;
+
+                l = bc_operation_PREC(t - XC_LEX_1st_op);
+                if (l >= r && (l != r || !left)) break;
+
+                xc_parse_push(BC_TOKEN_2_INST(t));
+                bc_vec_pop(&p->ops);
+                *nexprs -= (t != BC_LEX_OP_BOOL_NOT && t != XC_LEX_NEG);
+        }
+
+        bc_vec_push(&p->ops, &type);
+}
+
+static BC_STATUS zbc_parse_rightParen(size_t ops_bgn, size_t *nexs)
+{
+        BcParse *p = &G.prs;
+        BcLexType top;
+
+        if (p->ops.len <= ops_bgn)
+                RETURN_STATUS(bc_error_bad_expression());
+        top = BC_PARSE_TOP_OP(p);
+
+        while (top != BC_LEX_LPAREN) {
+                xc_parse_push(BC_TOKEN_2_INST(top));
+
+                bc_vec_pop(&p->ops);
+                *nexs -= (top != BC_LEX_OP_BOOL_NOT && top != XC_LEX_NEG);
+
+                if (p->ops.len <= ops_bgn)
+                        RETURN_STATUS(bc_error_bad_expression());
+                top = BC_PARSE_TOP_OP(p);
+        }
+
+        bc_vec_pop(&p->ops);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_parse_rightParen(...) (zbc_parse_rightParen(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_params(uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        size_t nparams;
+
+        dbg_lex("%s:%d p->lex:%d", __func__, __LINE__, p->lex);
+        flags = (flags & ~(BC_PARSE_PRINT | BC_PARSE_REL)) | BC_PARSE_ARRAY;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        nparams = 0;
+        if (p->lex != BC_LEX_RPAREN) {
+                for (;;) {
+                        s = zbc_parse_expr(flags);
+                        if (s) RETURN_STATUS(s);
+                        nparams++;
+                        if (p->lex != BC_LEX_COMMA) {
+                                if (p->lex == BC_LEX_RPAREN)
+                                        break;
+                                RETURN_STATUS(bc_error_bad_token());
+                        }
+                        s = zxc_lex_next();
+                        if (s) RETURN_STATUS(s);
+                }
+        }
+
+        xc_parse_pushInst_and_Index(BC_INST_CALL, nparams);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_parse_params(...) (zbc_parse_params(__VA_ARGS__) COMMA_SUCCESS)
+
+// Note: takes ownership of 'name' (must be malloced)
+static BC_STATUS zbc_parse_call(char *name, uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        BcId entry, *entry_ptr;
+        size_t idx;
+
+        entry.name = name;
+
+        s = zbc_parse_params(flags);
+        if (s) goto err;
+
+        if (p->lex != BC_LEX_RPAREN) {
+                s = bc_error_bad_token();
+                goto err;
+        }
+
+        idx = bc_map_find_exact(&G.prog.fn_map, &entry);
+
+        if (idx == BC_VEC_INVALID_IDX) {
+                // No such function exists, create an empty one
+                bc_program_addFunc(name);
+                idx = bc_map_find_exact(&G.prog.fn_map, &entry);
+        } else
+                free(name);
+
+        entry_ptr = bc_vec_item(&G.prog.fn_map, idx);
+        xc_parse_pushIndex(entry_ptr->idx);
+
+        RETURN_STATUS(zxc_lex_next());
+ err:
+        free(name);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_call(...) (zbc_parse_call(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_name(BcInst *type, uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        char *name;
+
+        name = xstrdup(p->lex_strnumbuf.v);
+        s = zxc_lex_next();
+        if (s) goto err;
+
+        if (p->lex == BC_LEX_LBRACKET) {
+                s = zxc_lex_next();
+                if (s) goto err;
+
+                if (p->lex == BC_LEX_RBRACKET) {
+                        if (!(flags & BC_PARSE_ARRAY)) {
+                                s = bc_error_bad_expression();
+                                goto err;
+                        }
+                        *type = XC_INST_ARRAY;
+                } else {
+                        *type = XC_INST_ARRAY_ELEM;
+                        flags &= ~(BC_PARSE_PRINT | BC_PARSE_REL);
+                        s = zbc_parse_expr(flags);
+                        if (s) goto err;
+                }
+                s = zxc_lex_next();
+                if (s) goto err;
+                xc_parse_push(*type);
+                xc_parse_pushName(name);
+                free(name);
+        } else if (p->lex == BC_LEX_LPAREN) {
+                if (flags & BC_PARSE_NOCALL) {
+                        s = bc_error_bad_token();
+                        goto err;
+                }
+                *type = BC_INST_CALL;
+                s = zbc_parse_call(name, flags);
+        } else {
+                *type = XC_INST_VAR;
+                xc_parse_push(XC_INST_VAR);
+                xc_parse_pushName(name);
+                free(name);
+        }
+
+        RETURN_STATUS(s);
+ err:
+        free(name);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_name(...) (zbc_parse_name(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_read(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_LPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_RPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        xc_parse_push(XC_INST_READ);
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_read(...) (zbc_parse_read(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_builtin(BcLexType type, uint8_t flags, BcInst *prev)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_LPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        flags = (flags & ~(BC_PARSE_PRINT | BC_PARSE_REL)) | BC_PARSE_ARRAY;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        s = zbc_parse_expr(flags);
+        if (s) RETURN_STATUS(s);
+
+        if (p->lex != BC_LEX_RPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        *prev = (type == BC_LEX_KEY_LENGTH) ? XC_INST_LENGTH : XC_INST_SQRT;
+        xc_parse_push(*prev);
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_builtin(...) (zbc_parse_builtin(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_scale(BcInst *type, uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        if (p->lex != BC_LEX_LPAREN) {
+                *type = XC_INST_SCALE;
+                xc_parse_push(XC_INST_SCALE);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        *type = XC_INST_SCALE_FUNC;
+        flags &= ~(BC_PARSE_PRINT | BC_PARSE_REL);
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        s = zbc_parse_expr(flags);
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_RPAREN)
+                RETURN_STATUS(bc_error_bad_token());
+        xc_parse_push(XC_INST_SCALE_FUNC);
+
+        RETURN_STATUS(zxc_lex_next());
+}
+#define zbc_parse_scale(...) (zbc_parse_scale(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_incdec(BcInst *prev, size_t *nexs, uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        BcLexType type;
+        char inst;
+        BcInst etype = *prev;
+
+        if (etype == XC_INST_VAR || etype == XC_INST_ARRAY_ELEM
+         || etype == XC_INST_SCALE || etype == BC_INST_LAST
+         || etype == XC_INST_IBASE || etype == XC_INST_OBASE
+        ) {
+                *prev = inst = BC_INST_INC_POST + (p->lex != BC_LEX_OP_INC);
+                xc_parse_push(inst);
+                s = zxc_lex_next();
+        } else {
+                *prev = inst = BC_INST_INC_PRE + (p->lex != BC_LEX_OP_INC);
+
+                s = zxc_lex_next();
+                if (s) RETURN_STATUS(s);
+                type = p->lex;
+
+                // Because we parse the next part of the expression
+                // right here, we need to increment this.
+                *nexs = *nexs + 1;
+
+                switch (type) {
+                case XC_LEX_NAME:
+                        s = zbc_parse_name(prev, flags | BC_PARSE_NOCALL);
+                        break;
+                case BC_LEX_KEY_IBASE:
+                case BC_LEX_KEY_LAST:
+                case BC_LEX_KEY_OBASE:
+                        xc_parse_push(type - BC_LEX_KEY_IBASE + XC_INST_IBASE);
+                        s = zxc_lex_next();
+                        break;
+                case BC_LEX_KEY_SCALE:
+                        s = zxc_lex_next();
+                        if (s) RETURN_STATUS(s);
+                        if (p->lex == BC_LEX_LPAREN)
+                                s = bc_error_bad_token();
+                        else
+                                xc_parse_push(XC_INST_SCALE);
+                        break;
+                default:
+                        s = bc_error_bad_token();
+                        break;
+                }
+
+                if (!s) xc_parse_push(inst);
+        }
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_incdec(...) (zbc_parse_incdec(__VA_ARGS__) COMMA_SUCCESS)
+
+static int bc_parse_inst_isLeaf(BcInst p)
+{
+        return (p >= XC_INST_NUM && p <= XC_INST_SQRT)
+                || p == BC_INST_INC_POST
+                || p == BC_INST_DEC_POST
+                ;
+}
+#define BC_PARSE_LEAF(prev, bin_last, rparen) \
+        (!(bin_last) && ((rparen) || bc_parse_inst_isLeaf(prev)))
+
+static BC_STATUS zbc_parse_minus(BcInst *prev, size_t ops_bgn,
+                                bool rparen, bool bin_last, size_t *nexprs)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        BcLexType type;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        type = BC_PARSE_LEAF(*prev, bin_last, rparen) ? XC_LEX_OP_MINUS : XC_LEX_NEG;
+        *prev = BC_TOKEN_2_INST(type);
+
+        // We can just push onto the op stack because this is the largest
+        // precedence operator that gets pushed. Inc/dec does not.
+        if (type != XC_LEX_OP_MINUS)
+                bc_vec_push(&p->ops, &type);
+        else
+                bc_parse_operator(type, ops_bgn, nexprs);
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_minus(...) (zbc_parse_minus(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_print(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        BcLexType type;
+
+        for (;;) {
+                s = zxc_lex_next();
+                if (s) RETURN_STATUS(s);
+                type = p->lex;
+                if (type == XC_LEX_STR) {
+                        s = zbc_parse_pushSTR();
+                } else {
+                        s = zbc_parse_expr(0);
+                }
+                if (s) RETURN_STATUS(s);
+                xc_parse_push(XC_INST_PRINT_POP);
+                if (p->lex != BC_LEX_COMMA)
+                        break;
+        }
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_print(...) (zbc_parse_print(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_return(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        BcLexType t;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        t = p->lex;
+        if (t == XC_LEX_NLINE || t == BC_LEX_SCOLON || t == BC_LEX_RBRACE)
+                xc_parse_push(BC_INST_RET0);
+        else {
+//TODO: if (p->func->voidfunc) ERROR
+                s = zbc_parse_expr(0);
+                if (s) RETURN_STATUS(s);
+
+                if (t != BC_LEX_LPAREN   // "return EXPR", no ()
+                 || p->lex_last != BC_LEX_RPAREN  // example: "return (a) + b"
+                ) {
+                        s = zbc_POSIX_requires("parentheses around return expressions");
+                        if (s) RETURN_STATUS(s);
+                }
+
+                xc_parse_push(XC_INST_RET);
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_return(...) (zbc_parse_return(__VA_ARGS__) COMMA_SUCCESS)
+
+static void rewrite_label_to_current(size_t idx)
+{
+        BcParse *p = &G.prs;
+        size_t *label = bc_vec_item(&p->func->labels, idx);
+        *label = p->func->code.len;
+}
+
+static BC_STATUS zbc_parse_if(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        size_t ip_idx;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_LPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        s = zbc_parse_expr(BC_PARSE_REL);
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_RPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        // Encode "if zero, jump to ..."
+        // Pushed value (destination of the jump) is uninitialized,
+        // will be rewritten to be address of "end of if()" or of "else".
+        ip_idx = bc_vec_push(&p->func->labels, &ip_idx);
+        bc_parse_pushJUMP_ZERO(ip_idx);
+
+        s = zbc_parse_stmt_allow_NLINE_before(STRING_if);
+        if (s) RETURN_STATUS(s);
+
+        dbg_lex("%s:%d in if after stmt: p->lex:%d", __func__, __LINE__, p->lex);
+        if (p->lex == BC_LEX_KEY_ELSE) {
+                size_t ip2_idx;
+
+                // Encode "after then_stmt, jump to end of if()"
+                ip2_idx = bc_vec_push(&p->func->labels, &ip2_idx);
+                dbg_lex("%s:%d after if() then_stmt: BC_INST_JUMP to %zd", __func__, __LINE__, ip2_idx);
+                bc_parse_pushJUMP(ip2_idx);
+
+                dbg_lex("%s:%d rewriting 'if_zero' label to jump to 'else'-> %zd", __func__, __LINE__, p->func->code.len);
+                rewrite_label_to_current(ip_idx);
+
+                ip_idx = ip2_idx;
+
+                s = zbc_parse_stmt_allow_NLINE_before(STRING_else);
+                if (s) RETURN_STATUS(s);
+        }
+
+        dbg_lex("%s:%d rewriting label to jump after 'if' body-> %zd", __func__, __LINE__, p->func->code.len);
+        rewrite_label_to_current(ip_idx);
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_if(...) (zbc_parse_if(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_while(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        size_t cond_idx;
+        size_t ip_idx;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_LPAREN) RETURN_STATUS(bc_error_bad_token());
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        cond_idx = bc_vec_push(&p->func->labels, &p->func->code.len);
+        ip_idx = cond_idx + 1;
+        bc_vec_push(&p->conds, &cond_idx);
+
+        bc_vec_push(&p->exits, &ip_idx);
+        bc_vec_push(&p->func->labels, &ip_idx);
+
+        s = zbc_parse_expr(BC_PARSE_REL);
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_RPAREN) RETURN_STATUS(bc_error_bad_token());
+
+        bc_parse_pushJUMP_ZERO(ip_idx);
+
+        s = zbc_parse_stmt_allow_NLINE_before(STRING_while);
+        if (s) RETURN_STATUS(s);
+
+        dbg_lex("%s:%d BC_INST_JUMP to %zd", __func__, __LINE__, cond_idx);
+        bc_parse_pushJUMP(cond_idx);
+
+        dbg_lex("%s:%d rewriting label-> %zd", __func__, __LINE__, p->func->code.len);
+        rewrite_label_to_current(ip_idx);
+
+        bc_vec_pop(&p->exits);
+        bc_vec_pop(&p->conds);
+
+        RETURN_STATUS(s);
+}
+#define zbc_parse_while(...) (zbc_parse_while(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_for(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        size_t cond_idx, exit_idx, body_idx, update_idx;
+
+        dbg_lex("%s:%d p->lex:%d", __func__, __LINE__, p->lex);
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != BC_LEX_LPAREN) RETURN_STATUS(bc_error_bad_token());
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        if (p->lex != BC_LEX_SCOLON) {
+                s = zbc_parse_expr(0);
+                xc_parse_push(XC_INST_POP);
+                if (s) RETURN_STATUS(s);
+        } else {
+                s = zbc_POSIX_does_not_allow_empty_X_expression_in_for("init");
+                if (s) RETURN_STATUS(s);
+        }
+
+        if (p->lex != BC_LEX_SCOLON) RETURN_STATUS(bc_error_bad_token());
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        cond_idx = bc_vec_push(&p->func->labels, &p->func->code.len);
+        update_idx = cond_idx + 1;
+        body_idx = update_idx + 1;
+        exit_idx = body_idx + 1;
+
+        if (p->lex != BC_LEX_SCOLON)
+                s = zbc_parse_expr(BC_PARSE_REL);
+        else {
+                // Set this for the next call to xc_parse_pushNUM().
+                // This is safe to set because the current token is a semicolon,
+                // which has no string requirement.
+                bc_vec_string(&p->lex_strnumbuf, 1, "1");
+                xc_parse_pushNUM();
+                s = zbc_POSIX_does_not_allow_empty_X_expression_in_for("condition");
+        }
+        if (s) RETURN_STATUS(s);
+
+        if (p->lex != BC_LEX_SCOLON) RETURN_STATUS(bc_error_bad_token());
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        bc_parse_pushJUMP_ZERO(exit_idx);
+        bc_parse_pushJUMP(body_idx);
+
+        bc_vec_push(&p->conds, &update_idx);
+        bc_vec_push(&p->func->labels, &p->func->code.len);
+
+        if (p->lex != BC_LEX_RPAREN) {
+                s = zbc_parse_expr(0);
+                if (s) RETURN_STATUS(s);
+                if (p->lex != BC_LEX_RPAREN) RETURN_STATUS(bc_error_bad_token());
+                xc_parse_push(XC_INST_POP);
+        } else {
+                s = zbc_POSIX_does_not_allow_empty_X_expression_in_for("update");
+                if (s) RETURN_STATUS(s);
+        }
+
+        bc_parse_pushJUMP(cond_idx);
+        bc_vec_push(&p->func->labels, &p->func->code.len);
+
+        bc_vec_push(&p->exits, &exit_idx);
+        bc_vec_push(&p->func->labels, &exit_idx);
+
+        s = zbc_parse_stmt_allow_NLINE_before(STRING_for);
+        if (s) RETURN_STATUS(s);
+
+        dbg_lex("%s:%d BC_INST_JUMP to %zd", __func__, __LINE__, update_idx);
+        bc_parse_pushJUMP(update_idx);
+
+        dbg_lex("%s:%d rewriting label-> %zd", __func__, __LINE__, p->func->code.len);
+        rewrite_label_to_current(exit_idx);
+
+        bc_vec_pop(&p->exits);
+        bc_vec_pop(&p->conds);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_parse_for(...) (zbc_parse_for(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_break_or_continue(BcLexType type)
+{
+        BcParse *p = &G.prs;
+        size_t i;
+
+        if (type == BC_LEX_KEY_BREAK) {
+                if (p->exits.len == 0) // none of the enclosing blocks is a loop
+                        RETURN_STATUS(bc_error_bad_token());
+                i = *(size_t*)bc_vec_top(&p->exits);
+        } else {
+                i = *(size_t*)bc_vec_top(&p->conds);
+        }
+        bc_parse_pushJUMP(i);
+
+        RETURN_STATUS(zxc_lex_next());
+}
+#define zbc_parse_break_or_continue(...) (zbc_parse_break_or_continue(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_func_insert(BcFunc *f, char *name, bool var)
+{
+        BcId *autoid;
+        BcId a;
+        size_t i;
+
+        autoid = (void*)f->autos.v;
+        for (i = 0; i < f->autos.len; i++, autoid++) {
+                if (strcmp(name, autoid->name) == 0
+                 && var == autoid->idx
+                ) {
+                        RETURN_STATUS(bc_error("duplicate function parameter or auto name"));
+                }
+        }
+
+        a.idx = var;
+        a.name = name;
+
+        bc_vec_push(&f->autos, &a);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_func_insert(...) (zbc_func_insert(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_funcdef(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        bool var, comma, voidfunc;
+        char *name;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != XC_LEX_NAME)
+                RETURN_STATUS(bc_error_bad_function_definition());
+
+        // To be maximally both POSIX and GNU-compatible,
+        // "void" is not treated as a normal keyword:
+        // you can have variable named "void", and even a function
+        // named "void": "define void() { return 6; }" is ok.
+        // _Only_ "define void f() ..." syntax treats "void"
+        // specially.
+        voidfunc = (strcmp(p->lex_strnumbuf.v, "void") == 0);
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        voidfunc = (voidfunc && p->lex == XC_LEX_NAME);
+        if (voidfunc) {
+                s = zxc_lex_next();
+                if (s) RETURN_STATUS(s);
+        }
+
+        if (p->lex != BC_LEX_LPAREN)
+                RETURN_STATUS(bc_error_bad_function_definition());
+
+        p->fidx = bc_program_addFunc(xstrdup(p->lex_strnumbuf.v));
+        p->func = xc_program_func(p->fidx);
+        p->func->voidfunc = voidfunc;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        comma = false;
+        while (p->lex != BC_LEX_RPAREN) {
+                if (p->lex != XC_LEX_NAME)
+                        RETURN_STATUS(bc_error_bad_function_definition());
+
+                ++p->func->nparams;
+
+                name = xstrdup(p->lex_strnumbuf.v);
+                s = zxc_lex_next();
+                if (s) goto err;
+
+                var = p->lex != BC_LEX_LBRACKET;
+
+                if (!var) {
+                        s = zxc_lex_next();
+                        if (s) goto err;
+
+                        if (p->lex != BC_LEX_RBRACKET) {
+                                s = bc_error_bad_function_definition();
+                                goto err;
+                        }
+
+                        s = zxc_lex_next();
+                        if (s) goto err;
+                }
+
+                comma = p->lex == BC_LEX_COMMA;
+                if (comma) {
+                        s = zxc_lex_next();
+                        if (s) goto err;
+                }
+
+                s = zbc_func_insert(p->func, name, var);
+                if (s) goto err;
+        }
+
+        if (comma) RETURN_STATUS(bc_error_bad_function_definition());
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        if (p->lex != BC_LEX_LBRACE) {
+                s = zbc_POSIX_requires("the left brace be on the same line as the function header");
+                if (s) RETURN_STATUS(s);
+        }
+
+        // Prevent "define z()<newline>" from being interpreted as function with empty stmt as body
+        s = zbc_lex_skip_if_at_NLINE();
+        if (s) RETURN_STATUS(s);
+        // GNU bc requires a {} block even if function body has single stmt, enforce this
+        if (p->lex != BC_LEX_LBRACE)
+                RETURN_STATUS(bc_error("function { body } expected"));
+
+        p->in_funcdef++; // to determine whether "return" stmt is allowed, and such
+        s = zbc_parse_stmt_possibly_auto(true);
+        p->in_funcdef--;
+        if (s) RETURN_STATUS(s);
+
+        xc_parse_push(BC_INST_RET0);
+
+        // Subsequent code generation is into main program
+        p->fidx = BC_PROG_MAIN;
+        p->func = xc_program_func_BC_PROG_MAIN();
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+ err:
+        dbg_lex_done("%s:%d done (error)", __func__, __LINE__);
+        free(name);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_funcdef(...) (zbc_parse_funcdef(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_auto(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+        char *name;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        for (;;) {
+                bool var;
+
+                if (p->lex != XC_LEX_NAME)
+                        RETURN_STATUS(bc_error_at("bad 'auto' syntax"));
+
+                name = xstrdup(p->lex_strnumbuf.v);
+                s = zxc_lex_next();
+                if (s) goto err;
+
+                var = (p->lex != BC_LEX_LBRACKET);
+                if (!var) {
+                        s = zxc_lex_next();
+                        if (s) goto err;
+
+                        if (p->lex != BC_LEX_RBRACKET) {
+                                s = bc_error_at("bad 'auto' syntax");
+                                goto err;
+                        }
+                        s = zxc_lex_next();
+                        if (s) goto err;
+                }
+
+                s = zbc_func_insert(p->func, name, var);
+                if (s) goto err;
+
+                if (p->lex == XC_LEX_NLINE
+                 || p->lex == BC_LEX_SCOLON
+                //|| p->lex == BC_LEX_RBRACE // allow "define f() {auto a}"
+                ) {
+                        break;
+                }
+                if (p->lex != BC_LEX_COMMA)
+                        RETURN_STATUS(bc_error_at("bad 'auto' syntax"));
+                s = zxc_lex_next(); // skip comma
+                if (s) RETURN_STATUS(s);
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+ err:
+        free(name);
+        dbg_lex_done("%s:%d done (ERROR)", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_auto(...) (zbc_parse_auto(__VA_ARGS__) COMMA_SUCCESS)
+
+#undef zbc_parse_stmt_possibly_auto
+static BC_STATUS zbc_parse_stmt_possibly_auto(bool auto_allowed)
+{
+        BcParse *p = &G.prs;
+        BcStatus s = BC_STATUS_SUCCESS;
+
+        dbg_lex_enter("%s:%d entered, p->lex:%d", __func__, __LINE__, p->lex);
+
+        if (p->lex == XC_LEX_NLINE) {
+                dbg_lex_done("%s:%d done (seen XC_LEX_NLINE)", __func__, __LINE__);
+                RETURN_STATUS(s);
+        }
+        if (p->lex == BC_LEX_SCOLON) {
+                dbg_lex_done("%s:%d done (seen BC_LEX_SCOLON)", __func__, __LINE__);
+                RETURN_STATUS(s);
+        }
+
+        if (p->lex == BC_LEX_LBRACE) {
+                dbg_lex("%s:%d BC_LEX_LBRACE: (auto_allowed:%d)", __func__, __LINE__, auto_allowed);
+                do {
+                        s = zxc_lex_next();
+                        if (s) RETURN_STATUS(s);
+                } while (p->lex == XC_LEX_NLINE);
+                if (auto_allowed && p->lex == BC_LEX_KEY_AUTO) {
+                        dbg_lex("%s:%d calling zbc_parse_auto()", __func__, __LINE__);
+                        s = zbc_parse_auto();
+                        if (s) RETURN_STATUS(s);
+                }
+                while (p->lex != BC_LEX_RBRACE) {
+                        dbg_lex("%s:%d block parsing loop", __func__, __LINE__);
+                        s = zbc_parse_stmt();
+                        if (s) RETURN_STATUS(s);
+                        // Check that next token is a correct stmt delimiter -
+                        // disallows "print 1 print 2" and such.
+                        if (p->lex == BC_LEX_RBRACE)
+                                break;
+                        if (p->lex != BC_LEX_SCOLON
+                         && p->lex != XC_LEX_NLINE
+                        ) {
+                                RETURN_STATUS(bc_error_at("bad statement terminator"));
+                        }
+                        s = zxc_lex_next();
+                        if (s) RETURN_STATUS(s);
+                }
+                s = zxc_lex_next();
+                dbg_lex_done("%s:%d done (seen BC_LEX_RBRACE)", __func__, __LINE__);
+                RETURN_STATUS(s);
+        }
+
+        dbg_lex("%s:%d p->lex:%d", __func__, __LINE__, p->lex);
+        switch (p->lex) {
+        case XC_LEX_OP_MINUS:
+        case BC_LEX_OP_INC:
+        case BC_LEX_OP_DEC:
+        case BC_LEX_OP_BOOL_NOT:
+        case BC_LEX_LPAREN:
+        case XC_LEX_NAME:
+        case XC_LEX_NUMBER:
+        case BC_LEX_KEY_IBASE:
+        case BC_LEX_KEY_LAST:
+        case BC_LEX_KEY_LENGTH:
+        case BC_LEX_KEY_OBASE:
+        case BC_LEX_KEY_READ:
+        case BC_LEX_KEY_SCALE:
+        case BC_LEX_KEY_SQRT:
+                s = zbc_parse_expr(BC_PARSE_PRINT);
+                break;
+        case XC_LEX_STR:
+                s = zbc_parse_pushSTR();
+                xc_parse_push(XC_INST_PRINT_STR);
+                break;
+        case BC_LEX_KEY_BREAK:
+        case BC_LEX_KEY_CONTINUE:
+                s = zbc_parse_break_or_continue(p->lex);
+                break;
+        case BC_LEX_KEY_FOR:
+                s = zbc_parse_for();
+                break;
+        case BC_LEX_KEY_HALT:
+                xc_parse_push(BC_INST_HALT);
+                s = zxc_lex_next();
+                break;
+        case BC_LEX_KEY_IF:
+                s = zbc_parse_if();
+                break;
+        case BC_LEX_KEY_LIMITS:
+                // "limits" is a compile-time command,
+                // the output is produced at _parse time_.
+                printf(
+                        "BC_BASE_MAX     = "BC_MAX_OBASE_STR "\n"
+                        "BC_DIM_MAX      = "BC_MAX_DIM_STR   "\n"
+                        "BC_SCALE_MAX    = "BC_MAX_SCALE_STR "\n"
+                        "BC_STRING_MAX   = "BC_MAX_STRING_STR"\n"
+                //      "BC_NUM_MAX      = "BC_MAX_NUM_STR   "\n" - GNU bc does not show this
+                        "MAX Exponent    = "BC_MAX_EXP_STR   "\n"
+                        "Number of vars  = "BC_MAX_VARS_STR  "\n"
+                );
+                s = zxc_lex_next();
+                break;
+        case BC_LEX_KEY_PRINT:
+                s = zbc_parse_print();
+                break;
+        case BC_LEX_KEY_QUIT:
+                // "quit" is a compile-time command. For example,
+                // "if (0 == 1) quit" terminates when parsing the statement,
+                // not when it is executed
+                QUIT_OR_RETURN_TO_MAIN;
+        case BC_LEX_KEY_RETURN:
+                if (!p->in_funcdef)
+                        RETURN_STATUS(bc_error("'return' not in a function"));
+                s = zbc_parse_return();
+                break;
+        case BC_LEX_KEY_WHILE:
+                s = zbc_parse_while();
+                break;
+        default:
+                s = bc_error_bad_token();
+                break;
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_stmt_possibly_auto(...) (zbc_parse_stmt_possibly_auto(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_parse_stmt_or_funcdef(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+//why?
+//      if (p->lex == XC_LEX_EOF)
+//              s = bc_error("end of file");
+//      else
+        if (p->lex == BC_LEX_KEY_DEFINE) {
+                dbg_lex("%s:%d p->lex:BC_LEX_KEY_DEFINE", __func__, __LINE__);
+                s = zbc_parse_funcdef();
+        } else {
+                dbg_lex("%s:%d p->lex:%d (not BC_LEX_KEY_DEFINE)", __func__, __LINE__, p->lex);
+                s = zbc_parse_stmt();
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zbc_parse_stmt_or_funcdef(...) (zbc_parse_stmt_or_funcdef(__VA_ARGS__) COMMA_SUCCESS)
+
+#undef zbc_parse_expr
+static BC_STATUS zbc_parse_expr(uint8_t flags)
+{
+        BcParse *p = &G.prs;
+        BcInst prev = XC_INST_PRINT;
+        size_t nexprs = 0, ops_bgn = p->ops.len;
+        unsigned nparens, nrelops;
+        bool paren_first, rprn, assign, bin_last, incdec;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        paren_first = (p->lex == BC_LEX_LPAREN);
+        nparens = nrelops = 0;
+        rprn = assign = incdec = false;
+        bin_last = true;
+
+        for (;;) {
+                bool get_token;
+                BcStatus s;
+                BcLexType t = p->lex;
+
+                if (!lex_allowed_in_bc_expr(t))
+                        break;
+
+                dbg_lex("%s:%d t:%d", __func__, __LINE__, t);
+                get_token = false;
+                s = BC_STATUS_SUCCESS;
+                switch (t) {
+                case BC_LEX_OP_INC:
+                case BC_LEX_OP_DEC:
+                        dbg_lex("%s:%d LEX_OP_INC/DEC", __func__, __LINE__);
+                        if (incdec) RETURN_STATUS(bc_error_bad_assignment());
+                        s = zbc_parse_incdec(&prev, &nexprs, flags);
+                        incdec = true;
+                        rprn = bin_last = false;
+                        //get_token = false; - already is
+                        break;
+                case XC_LEX_OP_MINUS:
+                        dbg_lex("%s:%d LEX_OP_MINUS", __func__, __LINE__);
+                        s = zbc_parse_minus(&prev, ops_bgn, rprn, bin_last, &nexprs);
+                        rprn = false;
+                        //get_token = false; - already is
+                        bin_last = (prev == XC_INST_MINUS);
+                        if (bin_last) incdec = false;
+                        break;
+                case BC_LEX_OP_ASSIGN_POWER:
+                case BC_LEX_OP_ASSIGN_MULTIPLY:
+                case BC_LEX_OP_ASSIGN_DIVIDE:
+                case BC_LEX_OP_ASSIGN_MODULUS:
+                case BC_LEX_OP_ASSIGN_PLUS:
+                case BC_LEX_OP_ASSIGN_MINUS:
+                case BC_LEX_OP_ASSIGN:
+                        dbg_lex("%s:%d LEX_ASSIGNxyz", __func__, __LINE__);
+                        if (prev != XC_INST_VAR && prev != XC_INST_ARRAY_ELEM
+                         && prev != XC_INST_SCALE && prev != XC_INST_IBASE
+                         && prev != XC_INST_OBASE && prev != BC_INST_LAST
+                        ) {
+                                RETURN_STATUS(bc_error_bad_assignment());
+                        }
+                // Fallthrough.
+                case XC_LEX_OP_POWER:
+                case XC_LEX_OP_MULTIPLY:
+                case XC_LEX_OP_DIVIDE:
+                case XC_LEX_OP_MODULUS:
+                case XC_LEX_OP_PLUS:
+                case XC_LEX_OP_REL_EQ:
+                case XC_LEX_OP_REL_LE:
+                case XC_LEX_OP_REL_GE:
+                case XC_LEX_OP_REL_NE:
+                case XC_LEX_OP_REL_LT:
+                case XC_LEX_OP_REL_GT:
+                case BC_LEX_OP_BOOL_NOT:
+                case BC_LEX_OP_BOOL_OR:
+                case BC_LEX_OP_BOOL_AND:
+                        dbg_lex("%s:%d LEX_OP_xyz", __func__, __LINE__);
+                        if (t == BC_LEX_OP_BOOL_NOT) {
+                                if (!bin_last && p->lex_last != BC_LEX_OP_BOOL_NOT)
+                                        RETURN_STATUS(bc_error_bad_expression());
+                        } else if (prev == XC_INST_BOOL_NOT) {
+                                RETURN_STATUS(bc_error_bad_expression());
+                        }
+
+                        nrelops += (t >= XC_LEX_OP_REL_EQ && t <= XC_LEX_OP_REL_GT);
+                        prev = BC_TOKEN_2_INST(t);
+                        bc_parse_operator(t, ops_bgn, &nexprs);
+                        rprn = incdec = false;
+                        get_token = true;
+                        bin_last = (t != BC_LEX_OP_BOOL_NOT);
+                        break;
+                case BC_LEX_LPAREN:
+                        dbg_lex("%s:%d LEX_LPAREN", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        bc_vec_push(&p->ops, &t);
+                        nparens++;
+                        get_token = true;
+                        rprn = incdec = false;
+                        break;
+                case BC_LEX_RPAREN:
+                        dbg_lex("%s:%d LEX_RPAREN", __func__, __LINE__);
+//why?
+//                      if (p->lex_last == BC_LEX_LPAREN) {
+//                              RETURN_STATUS(bc_error_at("empty expression"));
+//                      }
+                        if (bin_last || prev == XC_INST_BOOL_NOT)
+                                RETURN_STATUS(bc_error_bad_expression());
+                        if (nparens == 0) {
+                                goto exit_loop;
+                        }
+                        s = zbc_parse_rightParen(ops_bgn, &nexprs);
+                        nparens--;
+                        get_token = true;
+                        rprn = true;
+                        bin_last = incdec = false;
+                        break;
+                case XC_LEX_NAME:
+                        dbg_lex("%s:%d LEX_NAME", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        s = zbc_parse_name(&prev, flags & ~BC_PARSE_NOCALL);
+                        rprn = (prev == BC_INST_CALL);
+                        bin_last = false;
+                        //get_token = false; - already is
+                        nexprs++;
+                        break;
+                case XC_LEX_NUMBER:
+                        dbg_lex("%s:%d LEX_NUMBER", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        xc_parse_pushNUM();
+                        prev = XC_INST_NUM;
+                        get_token = true;
+                        rprn = bin_last = false;
+                        nexprs++;
+                        break;
+                case BC_LEX_KEY_IBASE:
+                case BC_LEX_KEY_LAST:
+                case BC_LEX_KEY_OBASE:
+                        dbg_lex("%s:%d LEX_IBASE/LAST/OBASE", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        prev = (char) (t - BC_LEX_KEY_IBASE + XC_INST_IBASE);
+                        xc_parse_push((char) prev);
+                        get_token = true;
+                        rprn = bin_last = false;
+                        nexprs++;
+                        break;
+                case BC_LEX_KEY_LENGTH:
+                case BC_LEX_KEY_SQRT:
+                        dbg_lex("%s:%d LEX_LEN/SQRT", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        s = zbc_parse_builtin(t, flags, &prev);
+                        get_token = true;
+                        rprn = bin_last = incdec = false;
+                        nexprs++;
+                        break;
+                case BC_LEX_KEY_READ:
+                        dbg_lex("%s:%d LEX_READ", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        s = zbc_parse_read();
+                        prev = XC_INST_READ;
+                        get_token = true;
+                        rprn = bin_last = incdec = false;
+                        nexprs++;
+                        break;
+                case BC_LEX_KEY_SCALE:
+                        dbg_lex("%s:%d LEX_SCALE", __func__, __LINE__);
+                        if (BC_PARSE_LEAF(prev, bin_last, rprn))
+                                RETURN_STATUS(bc_error_bad_expression());
+                        s = zbc_parse_scale(&prev, flags);
+                        //get_token = false; - already is
+                        rprn = bin_last = false;
+                        nexprs++;
+                        break;
+                default:
+                        RETURN_STATUS(bc_error_bad_token());
+                }
+
+                if (s || G_interrupt) // error, or ^C: stop parsing
+                        RETURN_STATUS(BC_STATUS_FAILURE);
+                if (get_token) {
+                        s = zxc_lex_next();
+                        if (s) RETURN_STATUS(s);
+                }
+        }
+ exit_loop:
+
+        while (p->ops.len > ops_bgn) {
+                BcLexType top = BC_PARSE_TOP_OP(p);
+                assign = (top >= BC_LEX_OP_ASSIGN_POWER && top <= BC_LEX_OP_ASSIGN);
+
+                if (top == BC_LEX_LPAREN || top == BC_LEX_RPAREN)
+                        RETURN_STATUS(bc_error_bad_expression());
+
+                xc_parse_push(BC_TOKEN_2_INST(top));
+
+                nexprs -= (top != BC_LEX_OP_BOOL_NOT && top != XC_LEX_NEG);
+                bc_vec_pop(&p->ops);
+        }
+
+        if (prev == XC_INST_BOOL_NOT || nexprs != 1)
+                RETURN_STATUS(bc_error_bad_expression());
+
+        if (!(flags & BC_PARSE_REL) && nrelops) {
+                BcStatus s;
+                s = zbc_POSIX_does_not_allow("comparison operators outside if or loops");
+                if (s) RETURN_STATUS(s);
+        } else if ((flags & BC_PARSE_REL) && nrelops > 1) {
+                BcStatus s;
+                s = zbc_POSIX_requires("exactly one comparison operator per condition");
+                if (s) RETURN_STATUS(s);
+        }
+
+        if (flags & BC_PARSE_PRINT) {
+                if (paren_first || !assign)
+                        xc_parse_push(XC_INST_PRINT);
+                xc_parse_push(XC_INST_POP);
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_parse_expr(...) (zbc_parse_expr(__VA_ARGS__) COMMA_SUCCESS)
+
+#endif // ENABLE_BC
+
+#if ENABLE_DC
+
+static BC_STATUS zdc_parse_register(void)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+        if (p->lex != XC_LEX_NAME) RETURN_STATUS(bc_error_bad_token());
+
+        xc_parse_pushName(p->lex_strnumbuf.v);
+
+        RETURN_STATUS(s);
+}
+#define zdc_parse_register(...) (zdc_parse_register(__VA_ARGS__) COMMA_SUCCESS)
+
+static void dc_parse_string(void)
+{
+        BcParse *p = &G.prs;
+        char *str;
+        size_t len = G.prog.strs.len;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+
+        str = xstrdup(p->lex_strnumbuf.v);
+        xc_parse_pushInst_and_Index(XC_INST_STR, len);
+        bc_vec_push(&G.prog.strs, &str);
+
+        // Explanation needed here
+        xc_program_add_fn();
+        p->func = xc_program_func(p->fidx);
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+}
+
+static BC_STATUS zdc_parse_mem(uint8_t inst, bool name, bool store)
+{
+        BcStatus s;
+
+        xc_parse_push(inst);
+        if (name) {
+                s = zdc_parse_register();
+                if (s) RETURN_STATUS(s);
+        }
+
+        if (store) {
+                xc_parse_push(DC_INST_SWAP);
+                xc_parse_push(XC_INST_ASSIGN);
+                xc_parse_push(XC_INST_POP);
+        }
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zdc_parse_mem(...) (zdc_parse_mem(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_parse_cond(uint8_t inst)
+{
+        BcParse *p = &G.prs;
+        BcStatus s;
+
+        xc_parse_push(inst);
+        xc_parse_push(DC_INST_EXEC_COND);
+
+        s = zdc_parse_register();
+        if (s) RETURN_STATUS(s);
+
+        s = zxc_lex_next();
+        if (s) RETURN_STATUS(s);
+
+        // Note that 'else' part can not be on the next line:
+        // echo -e '[1p]sa [2p]sb 2 1>a eb' | dc - OK, prints "2"
+        // echo -e '[1p]sa [2p]sb 2 1>a\neb' | dc - parse error
+        if (p->lex == DC_LEX_ELSE) {
+                s = zdc_parse_register();
+                if (s) RETURN_STATUS(s);
+                s = zxc_lex_next();
+        } else {
+                xc_parse_push('\0');
+        }
+
+        RETURN_STATUS(s);
+}
+#define zdc_parse_cond(...) (zdc_parse_cond(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_parse_token(BcLexType t)
+{
+        BcStatus s;
+        uint8_t inst;
+        bool assign, get_token;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = BC_STATUS_SUCCESS;
+        get_token = true;
+        switch (t) {
+        case XC_LEX_OP_REL_EQ:
+        case XC_LEX_OP_REL_LE:
+        case XC_LEX_OP_REL_GE:
+        case XC_LEX_OP_REL_NE:
+        case XC_LEX_OP_REL_LT:
+        case XC_LEX_OP_REL_GT:
+                dbg_lex("%s:%d LEX_OP_REL_xyz", __func__, __LINE__);
+                s = zdc_parse_cond(t - XC_LEX_OP_REL_EQ + XC_INST_REL_EQ);
+                get_token = false;
+                break;
+        case DC_LEX_SCOLON:
+        case DC_LEX_COLON:
+                dbg_lex("%s:%d LEX_[S]COLON", __func__, __LINE__);
+                s = zdc_parse_mem(XC_INST_ARRAY_ELEM, true, t == DC_LEX_COLON);
+                break;
+        case XC_LEX_STR:
+                dbg_lex("%s:%d LEX_STR", __func__, __LINE__);
+                dc_parse_string();
+                break;
+        case XC_LEX_NEG:
+                dbg_lex("%s:%d LEX_NEG", __func__, __LINE__);
+                s = zxc_lex_next();
+                if (s) RETURN_STATUS(s);
+                if (G.prs.lex != XC_LEX_NUMBER)
+                        RETURN_STATUS(bc_error_bad_token());
+                xc_parse_pushNUM();
+                xc_parse_push(XC_INST_NEG);
+                break;
+        case XC_LEX_NUMBER:
+                dbg_lex("%s:%d LEX_NUMBER", __func__, __LINE__);
+                xc_parse_pushNUM();
+                break;
+        case DC_LEX_READ:
+                dbg_lex("%s:%d LEX_KEY_READ", __func__, __LINE__);
+                xc_parse_push(XC_INST_READ);
+                break;
+        case DC_LEX_OP_ASSIGN:
+        case DC_LEX_STORE_PUSH:
+                dbg_lex("%s:%d LEX_OP_ASSIGN/STORE_PUSH", __func__, __LINE__);
+                assign = (t == DC_LEX_OP_ASSIGN);
+                inst = assign ? XC_INST_VAR : DC_INST_PUSH_TO_VAR;
+                s = zdc_parse_mem(inst, true, assign);
+                break;
+        case DC_LEX_LOAD:
+        case DC_LEX_LOAD_POP:
+                dbg_lex("%s:%d LEX_OP_LOAD[_POP]", __func__, __LINE__);
+                inst = t == DC_LEX_LOAD_POP ? DC_INST_PUSH_VAR : DC_INST_LOAD;
+                s = zdc_parse_mem(inst, true, false);
+                break;
+        case DC_LEX_STORE_IBASE:
+        case DC_LEX_STORE_SCALE:
+        case DC_LEX_STORE_OBASE:
+                dbg_lex("%s:%d LEX_OP_STORE_I/OBASE/SCALE", __func__, __LINE__);
+                inst = t - DC_LEX_STORE_IBASE + XC_INST_IBASE;
+                s = zdc_parse_mem(inst, false, true);
+                break;
+        default:
+                dbg_lex_done("%s:%d done (bad token)", __func__, __LINE__);
+                RETURN_STATUS(bc_error_bad_token());
+        }
+
+        if (!s && get_token) s = zxc_lex_next();
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zdc_parse_token(...) (zdc_parse_token(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_parse_expr(void)
+{
+        BcParse *p = &G.prs;
+        int i;
+
+        if (p->lex == XC_LEX_NLINE)
+                RETURN_STATUS(zxc_lex_next());
+
+        i = (int)p->lex - (int)XC_LEX_OP_POWER;
+        if (i >= 0) {
+                BcInst inst = dc_LEX_to_INST[i];
+                if (inst != DC_INST_INVALID) {
+                        xc_parse_push(inst);
+                        RETURN_STATUS(zxc_lex_next());
+                }
+        }
+        RETURN_STATUS(zdc_parse_token(p->lex));
+}
+#define zdc_parse_expr(...) (zdc_parse_expr(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_parse_exprs_until_eof(void)
+{
+        BcParse *p = &G.prs;
+        dbg_lex_enter("%s:%d entered, p->lex:%d", __func__, __LINE__, p->lex);
+        while (p->lex != XC_LEX_EOF) {
+                BcStatus s = zdc_parse_expr();
+                if (s) RETURN_STATUS(s);
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zdc_parse_exprs_until_eof(...) (zdc_parse_exprs_until_eof(__VA_ARGS__) COMMA_SUCCESS)
+
+#endif // ENABLE_DC
+
+//
+// Execution engine
+//
+
+#define BC_PROG_STR(n) (!(n)->num && !(n)->cap)
+#define BC_PROG_NUM(r, n) \
+        ((r)->t != XC_RESULT_ARRAY && (r)->t != XC_RESULT_STR && !BC_PROG_STR(n))
+
+#define STACK_HAS_MORE_THAN(s, n)          ((s)->len > ((size_t)(n)))
+#define STACK_HAS_EQUAL_OR_MORE_THAN(s, n) ((s)->len >= ((size_t)(n)))
+
+static BcVec* xc_program_search(char *id, bool var)
+{
+        BcId e, *ptr;
+        BcVec *v, *map;
+        size_t i;
+        int new;
+
+        v = var ? &G.prog.vars : &G.prog.arrs;
+        map = var ? &G.prog.var_map : &G.prog.arr_map;
+
+        e.name = id;
+        e.idx = v->len;
+        new = bc_map_insert(map, &e, &i); // 1 if insertion was successful
+
+        if (new) {
+                BcVec v2;
+                bc_array_init(&v2, var);
+                bc_vec_push(v, &v2);
+        }
+
+        ptr = bc_vec_item(map, i);
+        if (new) ptr->name = xstrdup(e.name);
+        return bc_vec_item(v, ptr->idx);
+}
+
+// 'num' need not be initialized on entry
+static BC_STATUS zxc_program_num(BcResult *r, BcNum **num)
+{
+        switch (r->t) {
+        case XC_RESULT_STR:
+        case XC_RESULT_TEMP:
+        IF_BC(case BC_RESULT_VOID:)
+        case XC_RESULT_IBASE:
+        case XC_RESULT_SCALE:
+        case XC_RESULT_OBASE:
+                *num = &r->d.n;
+                break;
+        case XC_RESULT_CONSTANT: {
+                BcStatus s;
+                char *str;
+                size_t len;
+
+                str = *xc_program_const(r->d.id.idx);
+                len = strlen(str);
+
+                bc_num_init(&r->d.n, len);
+
+                s = zxc_num_parse(&r->d.n, str, G.prog.ib_t);
+                if (s) {
+                        bc_num_free(&r->d.n);
+                        RETURN_STATUS(s);
+                }
+                *num = &r->d.n;
+                r->t = XC_RESULT_TEMP;
+                break;
+        }
+        case XC_RESULT_VAR:
+        case XC_RESULT_ARRAY:
+        case XC_RESULT_ARRAY_ELEM: {
+                BcVec *v;
+                void *p;
+                v = xc_program_search(r->d.id.name, r->t == XC_RESULT_VAR);
+// dc variables are all stacks, so here we have this:
+                p = bc_vec_top(v);
+// TODO: eliminate these stacks for bc-only config?
+                if (r->t == XC_RESULT_ARRAY_ELEM) {
+                        v = p;
+                        if (v->len <= r->d.id.idx)
+                                bc_array_expand(v, r->d.id.idx + 1);
+                        *num = bc_vec_item(v, r->d.id.idx);
+                } else {
+                        *num = p;
+                }
+                break;
+        }
+#if ENABLE_BC
+        case BC_RESULT_LAST:
+                *num = &G.prog.last;
+                break;
+        case BC_RESULT_ONE:
+                *num = &G.prog.one;
+                break;
+#endif
+#if SANITY_CHECKS
+        default:
+                // Testing the theory that dc does not reach LAST/ONE
+                bb_error_msg_and_die("BUG:%d", r->t);
+#endif
+        }
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zxc_program_num(...) (zxc_program_num(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_program_binOpPrep(BcResult **l, BcNum **ln,
+                                     BcResult **r, BcNum **rn, bool assign)
+{
+        BcStatus s;
+        BcResultType lt, rt;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 1))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+
+        *r = bc_vec_item_rev(&G.prog.results, 0);
+        *l = bc_vec_item_rev(&G.prog.results, 1);
+
+        s = zxc_program_num(*l, ln);
+        if (s) RETURN_STATUS(s);
+        s = zxc_program_num(*r, rn);
+        if (s) RETURN_STATUS(s);
+
+        lt = (*l)->t;
+        rt = (*r)->t;
+
+        // We run this again under these conditions in case any vector has been
+        // reallocated out from under the BcNums or arrays we had.
+        if (lt == rt && (lt == XC_RESULT_VAR || lt == XC_RESULT_ARRAY_ELEM)) {
+                s = zxc_program_num(*l, ln);
+                if (s) RETURN_STATUS(s);
+        }
+
+        if (!BC_PROG_NUM((*l), (*ln)) && (!assign || (*l)->t != XC_RESULT_VAR))
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+        if (!assign && !BC_PROG_NUM((*r), (*ln)))
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_binOpPrep(...) (zxc_program_binOpPrep(__VA_ARGS__) COMMA_SUCCESS)
+
+static void xc_program_binOpRetire(BcResult *r)
+{
+        r->t = XC_RESULT_TEMP;
+        bc_vec_pop(&G.prog.results);
+        bc_result_pop_and_push(r);
+}
+
+// Note: *r and *n need not be initialized by caller
+static BC_STATUS zxc_program_prep(BcResult **r, BcNum **n)
+{
+        BcStatus s;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+        *r = bc_vec_top(&G.prog.results);
+
+        s = zxc_program_num(*r, n);
+        if (s) RETURN_STATUS(s);
+
+        if (!BC_PROG_NUM((*r), (*n)))
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_prep(...) (zxc_program_prep(__VA_ARGS__) COMMA_SUCCESS)
+
+static void xc_program_retire(BcResult *r, BcResultType t)
+{
+        r->t = t;
+        bc_result_pop_and_push(r);
+}
+
+static BC_STATUS zxc_program_op(char inst)
+{
+        BcStatus s;
+        BcResult *opd1, *opd2, res;
+        BcNum *n1, *n2;
+
+        s = zxc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false);
+        if (s) RETURN_STATUS(s);
+        bc_num_init_DEF_SIZE(&res.d.n);
+
+        s = BC_STATUS_SUCCESS;
+        IF_ERROR_RETURN_POSSIBLE(s =) zxc_program_ops[inst - XC_INST_POWER](n1, n2, &res.d.n, G.prog.scale);
+        if (s) goto err;
+        xc_program_binOpRetire(&res);
+
+        RETURN_STATUS(s);
+ err:
+        bc_num_free(&res.d.n);
+        RETURN_STATUS(s);
+}
+#define zxc_program_op(...) (zxc_program_op(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_program_read(void)
+{
+        BcStatus s;
+        BcParse sv_parse;
+        BcVec buf;
+        BcInstPtr ip;
+        BcFunc *f;
+
+        bc_char_vec_init(&buf);
+        xc_read_line(&buf, stdin);
+
+        f = xc_program_func(BC_PROG_READ);
+        bc_vec_pop_all(&f->code);
+
+        sv_parse = G.prs; // struct copy
+        xc_parse_create(BC_PROG_READ);
+        //G.err_line = G.prs.lex_line = 1; - not needed, error line info is not printed for read()
+
+        s = zxc_parse_text_init(buf.v);
+        if (s) goto exec_err;
+        if (IS_BC) {
+                IF_BC(s = zbc_parse_expr(0));
+        } else {
+                IF_DC(s = zdc_parse_exprs_until_eof());
+        }
+        if (s) goto exec_err;
+        if (G.prs.lex != XC_LEX_NLINE && G.prs.lex != XC_LEX_EOF) {
+                s = bc_error_at("bad read() expression");
+                goto exec_err;
+        }
+        xc_parse_push(XC_INST_RET);
+
+        ip.func = BC_PROG_READ;
+        ip.inst_idx = 0;
+        bc_vec_push(&G.prog.exestack, &ip);
+
+ exec_err:
+        xc_parse_free();
+        G.prs = sv_parse; // struct copy
+        bc_vec_free(&buf);
+        RETURN_STATUS(s);
+}
+#define zxc_program_read(...) (zxc_program_read(__VA_ARGS__) COMMA_SUCCESS)
+
+static size_t xc_program_index(char *code, size_t *bgn)
+{
+        unsigned char *bytes = (void*)(code + *bgn);
+        unsigned amt;
+        unsigned i;
+        size_t res;
+
+        amt = *bytes++;
+        if (amt < SMALL_INDEX_LIMIT) {
+                *bgn += 1;
+                return amt;
+        }
+        amt -= (SMALL_INDEX_LIMIT - 1); // amt is 1 or more here
+        *bgn += amt + 1;
+
+        res = 0;
+        i = 0;
+        do {
+                res |= (size_t)(*bytes++) << i;
+                i += 8;
+        } while (--amt != 0);
+
+        return res;
+}
+
+static char *xc_program_name(char *code, size_t *bgn)
+{
+        code += *bgn;
+        *bgn += strlen(code) + 1;
+
+        return xstrdup(code);
+}
+
+static void xc_program_printString(const char *str)
+{
+#if ENABLE_DC
+        if (!str[0] && IS_DC) {
+                // Example: echo '[]ap' | dc
+                // should print two bytes: 0x00, 0x0A
+                bb_putchar('\0');
+                return;
+        }
+#endif
+        while (*str) {
+                char c = *str++;
+                if (c == '\\') {
+                        static const char esc[] ALIGN1 = "nabfrt""e\\";
+                        char *n;
+
+                        c = *str++;
+                        n = strchr(esc, c); // note: c can be NUL
+                        if (!n) {
+                                // Just print the backslash and following character
+                                bb_putchar('\\');
+                                ++G.prog.nchars;
+                        } else {
+                                if (n - esc == 0) // "\n" ?
+                                        G.prog.nchars = SIZE_MAX;
+                                c = "\n\a\b\f\r\t""\\\\""\\"[n - esc];
+                                //   n a b f r t   e \   \<end of line>
+                        }
+                }
+                putchar(c);
+                ++G.prog.nchars;
+        }
+}
+
+static void bc_num_printNewline(void)
+{
+        if (G.prog.nchars == G.prog.len - 1) {
+                bb_putchar('\\');
+                bb_putchar('\n');
+                G.prog.nchars = 0;
+        }
+}
+
+#if ENABLE_DC
+static FAST_FUNC void dc_num_printChar(size_t num, size_t width, bool radix)
+{
+        (void) radix;
+        bb_putchar((char) num);
+        G.prog.nchars += width;
+}
+#endif
+
+static FAST_FUNC void bc_num_printDigits(size_t num, size_t width, bool radix)
+{
+        size_t exp, pow;
+
+        bc_num_printNewline();
+        bb_putchar(radix ? '.' : ' ');
+        ++G.prog.nchars;
+
+        bc_num_printNewline();
+        for (exp = 0, pow = 1; exp < width - 1; ++exp, pow *= 10)
+                continue;
+
+        for (exp = 0; exp < width; pow /= 10, ++G.prog.nchars, ++exp) {
+                size_t dig;
+                bc_num_printNewline();
+                dig = num / pow;
+                num -= dig * pow;
+                bb_putchar(((char) dig) + '0');
+        }
+}
+
+static FAST_FUNC void bc_num_printHex(size_t num, size_t width, bool radix)
+{
+        if (radix) {
+                bc_num_printNewline();
+                bb_putchar('.');
+                G.prog.nchars++;
+        }
+
+        bc_num_printNewline();
+        bb_putchar(bb_hexdigits_upcase[num]);
+        G.prog.nchars += width;
+}
+
+static void bc_num_printDecimal(BcNum *n)
+{
+        size_t i, rdx = n->rdx - 1;
+
+        if (n->neg) {
+                bb_putchar('-');
+                G.prog.nchars++;
+        }
+
+        for (i = n->len - 1; i < n->len; --i)
+                bc_num_printHex((size_t) n->num[i], 1, i == rdx);
+}
+
+typedef void (*BcNumDigitOp)(size_t, size_t, bool) FAST_FUNC;
+
+static BC_STATUS zxc_num_printNum(BcNum *n, unsigned base_t, size_t width, BcNumDigitOp print)
+{
+        BcStatus s;
+        BcVec stack;
+        BcNum base;
+        BcDig base_digs[ULONG_NUM_BUFSIZE];
+        BcNum intp, fracp, digit, frac_len;
+        unsigned long dig, *ptr;
+        size_t i;
+        bool radix;
+
+        if (n->len == 0) {
+                print(0, width, false);
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+        }
+
+        bc_vec_init(&stack, sizeof(long), NULL);
+        bc_num_init(&intp, n->len);
+        bc_num_init(&fracp, n->rdx);
+        bc_num_init(&digit, width);
+        bc_num_init(&frac_len, BC_NUM_INT(n));
+        bc_num_copy(&intp, n);
+        bc_num_one(&frac_len);
+        base.cap = ARRAY_SIZE(base_digs);
+        base.num = base_digs;
+        bc_num_ulong2num(&base, base_t);
+
+        bc_num_truncate(&intp, intp.rdx);
+        s = zbc_num_sub(n, &intp, &fracp, 0);
+        if (s) goto err;
+
+        while (intp.len != 0) {
+                s = zbc_num_divmod(&intp, &base, &intp, &digit, 0);
+                if (s) goto err;
+                s = zbc_num_ulong(&digit, &dig);
+                if (s) goto err;
+                bc_vec_push(&stack, &dig);
+        }
+
+        for (i = 0; i < stack.len; ++i) {
+                ptr = bc_vec_item_rev(&stack, i);
+                print(*ptr, width, false);
+        }
+
+        if (!n->rdx) goto err;
+
+        for (radix = true; frac_len.len <= n->rdx; radix = false) {
+                s = zbc_num_mul(&fracp, &base, &fracp, n->rdx);
+                if (s) goto err;
+                s = zbc_num_ulong(&fracp, &dig);
+                if (s) goto err;
+                bc_num_ulong2num(&intp, dig);
+                s = zbc_num_sub(&fracp, &intp, &fracp, 0);
+                if (s) goto err;
+                print(dig, width, radix);
+                s = zbc_num_mul(&frac_len, &base, &frac_len, 0);
+                if (s) goto err;
+        }
+ err:
+        bc_num_free(&frac_len);
+        bc_num_free(&digit);
+        bc_num_free(&fracp);
+        bc_num_free(&intp);
+        bc_vec_free(&stack);
+        RETURN_STATUS(s);
+}
+#define zxc_num_printNum(...) (zxc_num_printNum(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_num_printBase(BcNum *n)
+{
+        BcStatus s;
+        size_t width;
+        BcNumDigitOp print;
+        bool neg = n->neg;
+
+        if (neg) {
+                bb_putchar('-');
+                G.prog.nchars++;
+        }
+
+        n->neg = false;
+
+        if (G.prog.ob_t <= 16) {
+                width = 1;
+                print = bc_num_printHex;
+        } else {
+                unsigned i = G.prog.ob_t - 1;
+                width = 0;
+                for (;;) {
+                        width++;
+                        i /= 10;
+                        if (i == 0)
+                                break;
+                }
+                print = bc_num_printDigits;
+        }
+
+        s = zxc_num_printNum(n, G.prog.ob_t, width, print);
+        n->neg = neg;
+
+        RETURN_STATUS(s);
+}
+#define zxc_num_printBase(...) (zxc_num_printBase(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_num_print(BcNum *n, bool newline)
+{
+        BcStatus s = BC_STATUS_SUCCESS;
+
+        bc_num_printNewline();
+
+        if (n->len == 0) {
+                bb_putchar('0');
+                ++G.prog.nchars;
+        } else if (G.prog.ob_t == 10)
+                bc_num_printDecimal(n);
+        else
+                s = zxc_num_printBase(n);
+
+        if (newline) {
+                bb_putchar('\n');
+                G.prog.nchars = 0;
+        }
+
+        RETURN_STATUS(s);
+}
+#define zxc_num_print(...) (zxc_num_print(__VA_ARGS__) COMMA_SUCCESS)
+
+#if !ENABLE_DC
+// for bc, idx is always 0
+#define xc_program_print(inst, idx) \
+        xc_program_print(inst)
+#endif
+static BC_STATUS xc_program_print(char inst, size_t idx)
+{
+        BcStatus s;
+        BcResult *r;
+        BcNum *num;
+        IF_NOT_DC(size_t idx = 0);
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, idx))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+
+        r = bc_vec_item_rev(&G.prog.results, idx);
+#if ENABLE_BC
+        if (inst == XC_INST_PRINT && r->t == BC_RESULT_VOID)
+                // void function's result on stack, ignore
+                RETURN_STATUS(BC_STATUS_SUCCESS);
+#endif
+        s = zxc_program_num(r, &num);
+        if (s) RETURN_STATUS(s);
+
+        if (BC_PROG_NUM(r, num)) {
+                s = zxc_num_print(num, /*newline:*/ inst == XC_INST_PRINT);
+#if ENABLE_BC
+                if (!s && IS_BC) bc_num_copy(&G.prog.last, num);
+#endif
+        } else {
+                char *str;
+
+                idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : num->rdx;
+                str = *xc_program_str(idx);
+
+                if (inst == XC_INST_PRINT_STR) {
+                        char *nl;
+                        G.prog.nchars += printf("%s", str);
+                        nl = strrchr(str, '\n');
+                        if (nl)
+                                G.prog.nchars = strlen(nl + 1);
+                } else {
+                        xc_program_printString(str);
+                        if (inst == XC_INST_PRINT)
+                                bb_putchar('\n');
+                }
+        }
+
+        if (!s && inst != XC_INST_PRINT) bc_vec_pop(&G.prog.results);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_print(...) (xc_program_print(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_program_negate(void)
+{
+        BcStatus s;
+        BcResult res, *ptr;
+        BcNum *num;
+
+        s = zxc_program_prep(&ptr, &num);
+        if (s) RETURN_STATUS(s);
+
+        bc_num_init(&res.d.n, num->len);
+        bc_num_copy(&res.d.n, num);
+        if (res.d.n.len) res.d.n.neg = !res.d.n.neg;
+
+        xc_program_retire(&res, XC_RESULT_TEMP);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_negate(...) (zxc_program_negate(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_program_logical(char inst)
+{
+        BcStatus s;
+        BcResult *opd1, *opd2, res;
+        BcNum *n1, *n2;
+        ssize_t cond;
+
+        s = zxc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false);
+        if (s) RETURN_STATUS(s);
+
+        bc_num_init_DEF_SIZE(&res.d.n);
+
+        if (inst == XC_INST_BOOL_AND)
+                cond = bc_num_cmp(n1, &G.prog.zero) && bc_num_cmp(n2, &G.prog.zero);
+        else if (inst == XC_INST_BOOL_OR)
+                cond = bc_num_cmp(n1, &G.prog.zero) || bc_num_cmp(n2, &G.prog.zero);
+        else {
+                cond = bc_num_cmp(n1, n2);
+                switch (inst) {
+                case XC_INST_REL_EQ:
+                        cond = (cond == 0);
+                        break;
+                case XC_INST_REL_LE:
+                        cond = (cond <= 0);
+                        break;
+                case XC_INST_REL_GE:
+                        cond = (cond >= 0);
+                        break;
+                case XC_INST_REL_LT:
+                        cond = (cond < 0);
+                        break;
+                case XC_INST_REL_GT:
+                        cond = (cond > 0);
+                        break;
+                default: // = case XC_INST_REL_NE:
+                        //cond = (cond != 0); - not needed
+                        break;
+                }
+        }
+
+        if (cond) bc_num_one(&res.d.n);
+        //else bc_num_zero(&res.d.n); - already is
+
+        xc_program_binOpRetire(&res);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_logical(...) (zxc_program_logical(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_DC
+static BC_STATUS zdc_program_assignStr(BcResult *r, BcVec *v, bool push)
+{
+        BcNum n2;
+        BcResult res;
+
+        memset(&n2, 0, sizeof(BcNum));
+        n2.rdx = res.d.id.idx = r->d.id.idx;
+        res.t = XC_RESULT_STR;
+
+        if (!push) {
+                if (!STACK_HAS_MORE_THAN(&G.prog.results, 1))
+                        RETURN_STATUS(bc_error_stack_has_too_few_elements());
+                bc_vec_pop(v);
+                bc_vec_pop(&G.prog.results);
+        }
+
+        bc_result_pop_and_push(&res);
+        bc_vec_push(v, &n2);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zdc_program_assignStr(...) (zdc_program_assignStr(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_DC
+
+static BC_STATUS zxc_program_popResultAndCopyToVar(char *name, bool var)
+{
+        BcStatus s;
+        BcResult *ptr, r;
+        BcVec *v;
+        BcNum *n;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+
+        ptr = bc_vec_top(&G.prog.results);
+        if ((ptr->t == XC_RESULT_ARRAY) != !var)
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+        v = xc_program_search(name, var);
+
+#if ENABLE_DC
+        if (ptr->t == XC_RESULT_STR && !var)
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+        if (ptr->t == XC_RESULT_STR)
+                RETURN_STATUS(zdc_program_assignStr(ptr, v, true));
+#endif
+
+        s = zxc_program_num(ptr, &n);
+        if (s) RETURN_STATUS(s);
+
+        // Do this once more to make sure that pointers were not invalidated.
+        v = xc_program_search(name, var);
+
+        if (var) {
+                bc_num_init_DEF_SIZE(&r.d.n);
+                bc_num_copy(&r.d.n, n);
+        } else {
+                bc_array_init(&r.d.v, true);
+                bc_array_copy(&r.d.v, (BcVec *) n);
+        }
+
+        bc_vec_push(v, &r.d);
+        bc_vec_pop(&G.prog.results);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_popResultAndCopyToVar(...) (zxc_program_popResultAndCopyToVar(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_program_assign(char inst)
+{
+        BcStatus s;
+        BcResult *left, *right, res;
+        BcNum *l, *r;
+        bool assign = (inst == XC_INST_ASSIGN);
+        bool ib, sc;
+
+        s = zxc_program_binOpPrep(&left, &l, &right, &r, assign);
+        if (s) RETURN_STATUS(s);
+
+        ib = left->t == XC_RESULT_IBASE;
+        sc = left->t == XC_RESULT_SCALE;
+
+#if ENABLE_DC
+        if (right->t == XC_RESULT_STR) {
+                BcVec *v;
+
+                if (left->t != XC_RESULT_VAR)
+                        RETURN_STATUS(bc_error_variable_is_wrong_type());
+                v = xc_program_search(left->d.id.name, true);
+
+                RETURN_STATUS(zdc_program_assignStr(right, v, false));
+        }
+#endif
+
+        if (left->t == XC_RESULT_CONSTANT
+         || left->t == XC_RESULT_TEMP
+        IF_BC(|| left->t == BC_RESULT_VOID)
+        ) {
+                RETURN_STATUS(bc_error_bad_assignment());
+        }
+
+#if ENABLE_BC
+        if (assign)
+                bc_num_copy(l, r);
+        else {
+                s = BC_STATUS_SUCCESS;
+                IF_ERROR_RETURN_POSSIBLE(s =) zxc_program_ops[inst - BC_INST_ASSIGN_POWER](l, r, l, G.prog.scale);
+        }
+        if (s) RETURN_STATUS(s);
+#else
+        bc_num_copy(l, r);
+#endif
+
+        if (ib || sc || left->t == XC_RESULT_OBASE) {
+                static const char *const msg[] = {
+                        "bad ibase; must be [2,16]",                 //XC_RESULT_IBASE
+                        "bad obase; must be [2,"BC_MAX_OBASE_STR"]", //XC_RESULT_OBASE
+                        "bad scale; must be [0,"BC_MAX_SCALE_STR"]", //XC_RESULT_SCALE
+                };
+                size_t *ptr;
+                size_t max;
+                unsigned long val;
+
+                s = zbc_num_ulong(l, &val);
+                if (s) RETURN_STATUS(s);
+                s = left->t - XC_RESULT_IBASE;
+                if (sc) {
+                        max = BC_MAX_SCALE;
+                        ptr = &G.prog.scale;
+                } else {
+                        if (val < 2)
+                                RETURN_STATUS(bc_error(msg[s]));
+                        max = ib ? BC_NUM_MAX_IBASE : BC_MAX_OBASE;
+                        ptr = ib ? &G.prog.ib_t : &G.prog.ob_t;
+                }
+
+                if (val > max)
+                        RETURN_STATUS(bc_error(msg[s]));
+
+                *ptr = (size_t) val;
+                s = BC_STATUS_SUCCESS;
+        }
+
+        bc_num_init(&res.d.n, l->len);
+        bc_num_copy(&res.d.n, l);
+        xc_program_binOpRetire(&res);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_assign(...) (zxc_program_assign(__VA_ARGS__) COMMA_SUCCESS)
+
+#if !ENABLE_DC
+#define xc_program_pushVar(code, bgn, pop, copy) \
+        xc_program_pushVar(code, bgn)
+// for bc, 'pop' and 'copy' are always false
+#endif
+static BC_STATUS xc_program_pushVar(char *code, size_t *bgn,
+                                   bool pop, bool copy)
+{
+        BcResult r;
+        char *name = xc_program_name(code, bgn);
+
+        r.t = XC_RESULT_VAR;
+        r.d.id.name = name;
+
+#if ENABLE_DC
+        if (pop || copy) {
+                BcVec *v = xc_program_search(name, true);
+                BcNum *num = bc_vec_top(v);
+
+                free(name);
+                if (!STACK_HAS_MORE_THAN(v, 1 - copy)) {
+                        RETURN_STATUS(bc_error_stack_has_too_few_elements());
+                }
+
+                if (!BC_PROG_STR(num)) {
+                        r.t = XC_RESULT_TEMP;
+                        bc_num_init_DEF_SIZE(&r.d.n);
+                        bc_num_copy(&r.d.n, num);
+                } else {
+                        r.t = XC_RESULT_STR;
+                        r.d.id.idx = num->rdx;
+                }
+
+                if (!copy) bc_vec_pop(v);
+        }
+#endif // ENABLE_DC
+
+        bc_vec_push(&G.prog.results, &r);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zxc_program_pushVar(...) (xc_program_pushVar(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_program_pushArray(char *code, size_t *bgn, char inst)
+{
+        BcStatus s = BC_STATUS_SUCCESS;
+        BcResult r;
+        BcNum *num;
+
+        r.d.id.name = xc_program_name(code, bgn);
+
+        if (inst == XC_INST_ARRAY) {
+                r.t = XC_RESULT_ARRAY;
+                bc_vec_push(&G.prog.results, &r);
+        } else {
+                BcResult *operand;
+                unsigned long temp;
+
+                s = zxc_program_prep(&operand, &num);
+                if (s) goto err;
+                s = zbc_num_ulong(num, &temp);
+                if (s) goto err;
+
+                if (temp > BC_MAX_DIM) {
+                        s = bc_error("array too long; must be [1,"BC_MAX_DIM_STR"]");
+                        goto err;
+                }
+
+                r.d.id.idx = (size_t) temp;
+                xc_program_retire(&r, XC_RESULT_ARRAY_ELEM);
+        }
+ err:
+        if (s) free(r.d.id.name);
+        RETURN_STATUS(s);
+}
+#define zbc_program_pushArray(...) (zbc_program_pushArray(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_BC
+static BC_STATUS zbc_program_incdec(char inst)
+{
+        BcStatus s;
+        BcResult *ptr, res, copy;
+        BcNum *num;
+        char inst2 = inst;
+
+        s = zxc_program_prep(&ptr, &num);
+        if (s) RETURN_STATUS(s);
+
+        if (inst == BC_INST_INC_POST || inst == BC_INST_DEC_POST) {
+                copy.t = XC_RESULT_TEMP;
+                bc_num_init(&copy.d.n, num->len);
+                bc_num_copy(&copy.d.n, num);
+        }
+
+        res.t = BC_RESULT_ONE;
+        inst = (inst == BC_INST_INC_PRE || inst == BC_INST_INC_POST)
+                        ? BC_INST_ASSIGN_PLUS
+                        : BC_INST_ASSIGN_MINUS;
+
+        bc_vec_push(&G.prog.results, &res);
+        s = zxc_program_assign(inst);
+        if (s) RETURN_STATUS(s);
+
+        if (inst2 == BC_INST_INC_POST || inst2 == BC_INST_DEC_POST) {
+                bc_result_pop_and_push(&copy);
+        }
+
+        RETURN_STATUS(s);
+}
+#define zbc_program_incdec(...) (zbc_program_incdec(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_program_call(char *code, size_t *idx)
+{
+        BcInstPtr ip;
+        size_t i, nparams;
+        BcId *a;
+        BcFunc *func;
+
+        nparams = xc_program_index(code, idx);
+        ip.func = xc_program_index(code, idx);
+        func = xc_program_func(ip.func);
+
+        if (func->code.len == 0) {
+                RETURN_STATUS(bc_error("undefined function"));
+        }
+        if (nparams != func->nparams) {
+                RETURN_STATUS(bc_error_fmt("function has %u parameters, but called with %u", func->nparams, nparams));
+        }
+        ip.inst_idx = 0;
+
+        for (i = 0; i < nparams; ++i) {
+                BcResult *arg;
+                BcStatus s;
+
+                a = bc_vec_item(&func->autos, nparams - 1 - i);
+                arg = bc_vec_top(&G.prog.results);
+
+                if ((!a->idx) != (arg->t == XC_RESULT_ARRAY) // array/variable mismatch
+                // || arg->t == XC_RESULT_STR - impossible, f("str") is not a legal syntax (strings are not bc expressions)
+                ) {
+                        RETURN_STATUS(bc_error_variable_is_wrong_type());
+                }
+                s = zxc_program_popResultAndCopyToVar(a->name, a->idx);
+                if (s) RETURN_STATUS(s);
+        }
+
+        a = bc_vec_item(&func->autos, i);
+        for (; i < func->autos.len; i++, a++) {
+                BcVec *v;
+
+                v = xc_program_search(a->name, a->idx);
+                if (a->idx) {
+                        BcNum n2;
+                        bc_num_init_DEF_SIZE(&n2);
+                        bc_vec_push(v, &n2);
+                } else {
+                        BcVec v2;
+                        bc_array_init(&v2, true);
+                        bc_vec_push(v, &v2);
+                }
+        }
+
+        bc_vec_push(&G.prog.exestack, &ip);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_program_call(...) (zbc_program_call(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zbc_program_return(char inst)
+{
+        BcResult res;
+        BcFunc *f;
+        BcId *a;
+        size_t i;
+        BcInstPtr *ip = bc_vec_top(&G.prog.exestack);
+
+        f = xc_program_func(ip->func);
+
+        res.t = XC_RESULT_TEMP;
+        if (inst == XC_INST_RET) {
+                // bc needs this for e.g. RESULT_CONSTANT ("return 5")
+                // because bc constants are per-function.
+                // TODO: maybe avoid if value is already RESULT_TEMP?
+                BcStatus s;
+                BcNum *num;
+                BcResult *operand = bc_vec_top(&G.prog.results);
+
+                s = zxc_program_num(operand, &num);
+                if (s) RETURN_STATUS(s);
+                bc_num_init(&res.d.n, num->len);
+                bc_num_copy(&res.d.n, num);
+                bc_vec_pop(&G.prog.results);
+        } else {
+                if (f->voidfunc)
+                        res.t = BC_RESULT_VOID;
+                bc_num_init_DEF_SIZE(&res.d.n);
+                //bc_num_zero(&res.d.n); - already is
+        }
+        bc_vec_push(&G.prog.results, &res);
+
+        bc_vec_pop(&G.prog.exestack);
+
+        // We need to pop arguments as well, so this takes that into account.
+        a = (void*)f->autos.v;
+        for (i = 0; i < f->autos.len; i++, a++) {
+                BcVec *v;
+                v = xc_program_search(a->name, a->idx);
+                bc_vec_pop(v);
+        }
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zbc_program_return(...) (zbc_program_return(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_BC
+
+static unsigned long xc_program_scale(BcNum *n)
+{
+        return (unsigned long) n->rdx;
+}
+
+static unsigned long xc_program_len(BcNum *n)
+{
+        size_t len = n->len;
+
+        if (n->rdx != len) return len;
+        for (;;) {
+                if (len == 0) break;
+                len--;
+                if (n->num[len] != 0) break;
+        }
+        return len;
+}
+
+static BC_STATUS zxc_program_builtin(char inst)
+{
+        BcStatus s;
+        BcResult *opnd;
+        BcNum *num;
+        BcResult res;
+        bool len = (inst == XC_INST_LENGTH);
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+        opnd = bc_vec_top(&G.prog.results);
+
+        s = zxc_program_num(opnd, &num);
+        if (s) RETURN_STATUS(s);
+
+#if ENABLE_DC
+        if (!BC_PROG_NUM(opnd, num) && !len)
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+#endif
+
+        bc_num_init_DEF_SIZE(&res.d.n);
+
+        if (inst == XC_INST_SQRT)
+                s = zbc_num_sqrt(num, &res.d.n, G.prog.scale);
+#if ENABLE_BC
+        else if (len != 0 && opnd->t == XC_RESULT_ARRAY) {
+                bc_num_ulong2num(&res.d.n, (unsigned long) ((BcVec *) num)->len);
+        }
+#endif
+#if ENABLE_DC
+        else if (len != 0 && !BC_PROG_NUM(opnd, num)) {
+                char **str;
+                size_t idx = opnd->t == XC_RESULT_STR ? opnd->d.id.idx : num->rdx;
+
+                str = xc_program_str(idx);
+                bc_num_ulong2num(&res.d.n, strlen(*str));
+        }
+#endif
+        else {
+                bc_num_ulong2num(&res.d.n, len ? xc_program_len(num) : xc_program_scale(num));
+        }
+
+        xc_program_retire(&res, XC_RESULT_TEMP);
+
+        RETURN_STATUS(s);
+}
+#define zxc_program_builtin(...) (zxc_program_builtin(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_DC
+static BC_STATUS zdc_program_divmod(void)
+{
+        BcStatus s;
+        BcResult *opd1, *opd2, res, res2;
+        BcNum *n1, *n2;
+
+        s = zxc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false);
+        if (s) RETURN_STATUS(s);
+
+        bc_num_init_DEF_SIZE(&res.d.n);
+        bc_num_init(&res2.d.n, n2->len);
+
+        s = zbc_num_divmod(n1, n2, &res2.d.n, &res.d.n, G.prog.scale);
+        if (s) goto err;
+
+        xc_program_binOpRetire(&res2);
+        res.t = XC_RESULT_TEMP;
+        bc_vec_push(&G.prog.results, &res);
+
+        RETURN_STATUS(s);
+ err:
+        bc_num_free(&res2.d.n);
+        bc_num_free(&res.d.n);
+        RETURN_STATUS(s);
+}
+#define zdc_program_divmod(...) (zdc_program_divmod(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_program_modexp(void)
+{
+        BcStatus s;
+        BcResult *r1, *r2, *r3, res;
+        BcNum *n1, *n2, *n3;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 2))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+        s = zxc_program_binOpPrep(&r2, &n2, &r3, &n3, false);
+        if (s) RETURN_STATUS(s);
+
+        r1 = bc_vec_item_rev(&G.prog.results, 2);
+        s = zxc_program_num(r1, &n1);
+        if (s) RETURN_STATUS(s);
+        if (!BC_PROG_NUM(r1, n1))
+                RETURN_STATUS(bc_error_variable_is_wrong_type());
+
+        // Make sure that the values have their pointers updated, if necessary.
+        if (r1->t == XC_RESULT_VAR || r1->t == XC_RESULT_ARRAY_ELEM) {
+                if (r1->t == r2->t) {
+                        s = zxc_program_num(r2, &n2);
+                        if (s) RETURN_STATUS(s);
+                }
+                if (r1->t == r3->t) {
+                        s = zxc_program_num(r3, &n3);
+                        if (s) RETURN_STATUS(s);
+                }
+        }
+
+        bc_num_init(&res.d.n, n3->len);
+        s = zdc_num_modexp(n1, n2, n3, &res.d.n);
+        if (s) goto err;
+
+        bc_vec_pop(&G.prog.results);
+        xc_program_binOpRetire(&res);
+
+        RETURN_STATUS(s);
+ err:
+        bc_num_free(&res.d.n);
+        RETURN_STATUS(s);
+}
+#define zdc_program_modexp(...) (zdc_program_modexp(__VA_ARGS__) COMMA_SUCCESS)
+
+static void dc_program_stackLen(void)
+{
+        BcResult res;
+        size_t len = G.prog.results.len;
+
+        res.t = XC_RESULT_TEMP;
+
+        bc_num_init_DEF_SIZE(&res.d.n);
+        bc_num_ulong2num(&res.d.n, len);
+        bc_vec_push(&G.prog.results, &res);
+}
+
+static BC_STATUS zdc_program_asciify(void)
+{
+        BcStatus s;
+        BcResult *r, res;
+        BcNum *num, n;
+        char **strs;
+        char *str;
+        char c;
+        size_t idx;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+
+        r = bc_vec_top(&G.prog.results);
+        s = zxc_program_num(r, &num);
+        if (s) RETURN_STATUS(s);
+
+        if (BC_PROG_NUM(r, num)) {
+                unsigned long val;
+                BcNum strmb;
+                BcDig strmb_digs[ULONG_NUM_BUFSIZE];
+
+                bc_num_init_DEF_SIZE(&n);
+                bc_num_copy(&n, num);
+                bc_num_truncate(&n, n.rdx);
+
+                strmb.cap = ARRAY_SIZE(strmb_digs);
+                strmb.num = strmb_digs;
+                bc_num_ulong2num(&strmb, 0x100);
+
+                s = zbc_num_mod(&n, &strmb, &n, 0);
+                if (s) goto num_err;
+                s = zbc_num_ulong(&n, &val);
+                if (s) goto num_err;
+
+                c = (char) val;
+
+                bc_num_free(&n);
+        } else {
+                char *sp;
+                idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : num->rdx;
+                sp = *xc_program_str(idx);
+                c = sp[0];
+        }
+
+        strs = (void*)G.prog.strs.v;
+        for (idx = 0; idx < G.prog.strs.len; idx++) {
+                if (strs[idx][0] == c && strs[idx][1] == '\0') {
+                        goto dup;
+                }
+        }
+        str = xzalloc(2);
+        str[0] = c;
+        //str[1] = '\0'; - already is
+        bc_vec_push(&G.prog.strs, &str);
+ dup:
+        res.t = XC_RESULT_STR;
+        res.d.id.idx = idx;
+        bc_result_pop_and_push(&res);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+ num_err:
+        bc_num_free(&n);
+        RETURN_STATUS(s);
+}
+#define zdc_program_asciify(...) (zdc_program_asciify(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_program_printStream(void)
+{
+        BcStatus s;
+        BcResult *r;
+        BcNum *n;
+        size_t idx;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+        r = bc_vec_top(&G.prog.results);
+
+        s = zxc_program_num(r, &n);
+        if (s) RETURN_STATUS(s);
+
+        if (BC_PROG_NUM(r, n)) {
+                s = zxc_num_printNum(n, 0x100, 1, dc_num_printChar);
+        } else {
+                char *str;
+                idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : n->rdx;
+                str = *xc_program_str(idx);
+                fputs(str, stdout);
+        }
+
+        RETURN_STATUS(s);
+}
+#define zdc_program_printStream(...) (zdc_program_printStream(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_program_nquit(void)
+{
+        BcStatus s;
+        BcResult *opnd;
+        BcNum *num;
+        unsigned long val;
+
+        s = zxc_program_prep(&opnd, &num);
+        if (s) RETURN_STATUS(s);
+        s = zbc_num_ulong(num, &val);
+        if (s) RETURN_STATUS(s);
+
+        bc_vec_pop(&G.prog.results);
+
+        if (G.prog.exestack.len < val)
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+        if (G.prog.exestack.len == val) {
+                QUIT_OR_RETURN_TO_MAIN;
+        }
+
+        bc_vec_npop(&G.prog.exestack, val);
+
+        RETURN_STATUS(s);
+}
+#define zdc_program_nquit(...) (zdc_program_nquit(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zdc_program_execStr(char *code, size_t *bgn, bool cond)
+{
+        BcStatus s = BC_STATUS_SUCCESS;
+        BcResult *r;
+        BcFunc *f;
+        BcInstPtr ip;
+        size_t fidx, sidx;
+
+        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+
+        r = bc_vec_top(&G.prog.results);
+
+        if (cond) {
+                BcNum *n = n; // for compiler
+                bool exec;
+                char *name;
+                char *then_name = xc_program_name(code, bgn);
+                char *else_name = NULL;
+
+                if (code[*bgn] == '\0')
+                        (*bgn) += 1;
+                else
+                        else_name = xc_program_name(code, bgn);
+
+                exec = r->d.n.len != 0;
+                name = then_name;
+                if (!exec && else_name != NULL) {
+                        exec = true;
+                        name = else_name;
+                }
+
+                if (exec) {
+                        BcVec *v;
+                        v = xc_program_search(name, true);
+                        n = bc_vec_top(v);
+                }
+
+                free(then_name);
+                free(else_name);
+
+                if (!exec) goto exit;
+                if (!BC_PROG_STR(n)) {
+                        s = bc_error_variable_is_wrong_type();
+                        goto exit;
+                }
+
+                sidx = n->rdx;
+        } else {
+                if (r->t == XC_RESULT_STR) {
+                        sidx = r->d.id.idx;
+                } else if (r->t == XC_RESULT_VAR) {
+                        BcNum *n;
+                        s = zxc_program_num(r, &n);
+                        if (s || !BC_PROG_STR(n)) goto exit;
+                        sidx = n->rdx;
+                } else
+                        goto exit;
+        }
+
+        fidx = sidx + BC_PROG_REQ_FUNCS;
+
+        f = xc_program_func(fidx);
+
+        if (f->code.len == 0) {
+                BcParse sv_parse;
+                char *str;
+
+                sv_parse = G.prs; // struct copy
+                xc_parse_create(fidx);
+                str = *xc_program_str(sidx);
+                s = zxc_parse_text_init(str);
+                if (s) goto err;
+
+                s = zdc_parse_exprs_until_eof();
+                if (s) goto err;
+                xc_parse_push(DC_INST_POP_EXEC);
+                if (G.prs.lex != XC_LEX_EOF)
+                        s = bc_error_bad_expression();
+                xc_parse_free();
+                G.prs = sv_parse; // struct copy
+                if (s) {
+ err:
+                        bc_vec_pop_all(&f->code);
+                        goto exit;
+                }
+        }
+
+        ip.inst_idx = 0;
+        ip.func = fidx;
+
+        bc_vec_pop(&G.prog.results);
+        bc_vec_push(&G.prog.exestack, &ip);
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+ exit:
+        bc_vec_pop(&G.prog.results);
+        RETURN_STATUS(s);
+}
+#define zdc_program_execStr(...) (zdc_program_execStr(__VA_ARGS__) COMMA_SUCCESS)
+#endif // ENABLE_DC
+
+static void xc_program_pushGlobal(char inst)
+{
+        BcResult res;
+        unsigned long val;
+
+        res.t = inst - XC_INST_IBASE + XC_RESULT_IBASE;
+        if (inst == XC_INST_IBASE)
+                val = (unsigned long) G.prog.ib_t;
+        else if (inst == XC_INST_SCALE)
+                val = (unsigned long) G.prog.scale;
+        else
+                val = (unsigned long) G.prog.ob_t;
+
+        bc_num_init_DEF_SIZE(&res.d.n);
+        bc_num_ulong2num(&res.d.n, val);
+        bc_vec_push(&G.prog.results, &res);
+}
+
+static BC_STATUS zxc_program_exec(void)
+{
+        BcResult r, *ptr;
+        BcInstPtr *ip = bc_vec_top(&G.prog.exestack);
+        BcFunc *func = xc_program_func(ip->func);
+        char *code = func->code.v;
+
+        dbg_exec("func:%zd bytes:%zd ip:%zd results.len:%d",
+                        ip->func, func->code.len, ip->inst_idx, G.prog.results.len);
+        while (ip->inst_idx < func->code.len) {
+                BcStatus s = BC_STATUS_SUCCESS;
+                char inst = code[ip->inst_idx++];
+
+                dbg_exec("inst at %zd:%d results.len:%d", ip->inst_idx - 1, inst, G.prog.results.len);
+                switch (inst) {
+                case XC_INST_RET:
+                        if (IS_DC) { // end of '?' reached
+                                bc_vec_pop(&G.prog.exestack);
+                                goto read_updated_ip;
+                        }
+                        // bc: fall through
+#if ENABLE_BC
+                case BC_INST_RET0:
+                        dbg_exec("BC_INST_RET[0]:");
+                        s = zbc_program_return(inst);
+                        goto read_updated_ip;
+                case BC_INST_JUMP_ZERO: {
+                        BcNum *num;
+                        bool zero;
+                        dbg_exec("BC_INST_JUMP_ZERO:");
+                        s = zxc_program_prep(&ptr, &num);
+                        if (s) RETURN_STATUS(s);
+                        zero = (bc_num_cmp(num, &G.prog.zero) == 0);
+                        bc_vec_pop(&G.prog.results);
+                        if (!zero) {
+                                xc_program_index(code, &ip->inst_idx);
+                                break;
+                        }
+                        // else: fall through
+                }
+                case BC_INST_JUMP: {
+                        size_t idx = xc_program_index(code, &ip->inst_idx);
+                        size_t *addr = bc_vec_item(&func->labels, idx);
+                        dbg_exec("BC_INST_JUMP: to %ld", (long)*addr);
+                        ip->inst_idx = *addr;
+                        break;
+                }
+                case BC_INST_CALL:
+                        dbg_exec("BC_INST_CALL:");
+                        s = zbc_program_call(code, &ip->inst_idx);
+                        goto read_updated_ip;
+                case BC_INST_INC_PRE:
+                case BC_INST_DEC_PRE:
+                case BC_INST_INC_POST:
+                case BC_INST_DEC_POST:
+                        dbg_exec("BC_INST_INCDEC:");
+                        s = zbc_program_incdec(inst);
+                        break;
+                case BC_INST_HALT:
+                        dbg_exec("BC_INST_HALT:");
+                        QUIT_OR_RETURN_TO_MAIN;
+                        break;
+                case XC_INST_BOOL_OR:
+                case XC_INST_BOOL_AND:
+#endif // ENABLE_BC
+                case XC_INST_REL_EQ:
+                case XC_INST_REL_LE:
+                case XC_INST_REL_GE:
+                case XC_INST_REL_NE:
+                case XC_INST_REL_LT:
+                case XC_INST_REL_GT:
+                        dbg_exec("BC_INST_BOOL:");
+                        s = zxc_program_logical(inst);
+                        break;
+                case XC_INST_READ:
+                        dbg_exec("XC_INST_READ:");
+                        s = zxc_program_read();
+                        goto read_updated_ip;
+                case XC_INST_VAR:
+                        dbg_exec("XC_INST_VAR:");
+                        s = zxc_program_pushVar(code, &ip->inst_idx, false, false);
+                        break;
+                case XC_INST_ARRAY_ELEM:
+                case XC_INST_ARRAY:
+                        dbg_exec("XC_INST_ARRAY[_ELEM]:");
+                        s = zbc_program_pushArray(code, &ip->inst_idx, inst);
+                        break;
+#if ENABLE_BC
+                case BC_INST_LAST:
+                        dbg_exec("BC_INST_LAST:");
+                        r.t = BC_RESULT_LAST;
+                        bc_vec_push(&G.prog.results, &r);
+                        break;
+#endif
+                case XC_INST_IBASE:
+                case XC_INST_OBASE:
+                case XC_INST_SCALE:
+                        dbg_exec("XC_INST_internalvar(%d):", inst - XC_INST_IBASE);
+                        xc_program_pushGlobal(inst);
+                        break;
+                case XC_INST_SCALE_FUNC:
+                case XC_INST_LENGTH:
+                case XC_INST_SQRT:
+                        dbg_exec("BC_INST_builtin:");
+                        s = zxc_program_builtin(inst);
+                        break;
+                case XC_INST_NUM:
+                        dbg_exec("XC_INST_NUM:");
+                        r.t = XC_RESULT_CONSTANT;
+                        r.d.id.idx = xc_program_index(code, &ip->inst_idx);
+                        bc_vec_push(&G.prog.results, &r);
+                        break;
+                case XC_INST_POP:
+                        dbg_exec("XC_INST_POP:");
+                        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                                s = bc_error_stack_has_too_few_elements();
+                        else
+                                bc_vec_pop(&G.prog.results);
+                        break;
+                case XC_INST_PRINT:
+                case XC_INST_PRINT_POP:
+                case XC_INST_PRINT_STR:
+                        dbg_exec("XC_INST_PRINTxyz(%d):", inst - XC_INST_PRINT);
+                        s = zxc_program_print(inst, 0);
+                        break;
+                case XC_INST_STR:
+                        dbg_exec("XC_INST_STR:");
+                        r.t = XC_RESULT_STR;
+                        r.d.id.idx = xc_program_index(code, &ip->inst_idx);
+                        bc_vec_push(&G.prog.results, &r);
+                        break;
+                case XC_INST_POWER:
+                case XC_INST_MULTIPLY:
+                case XC_INST_DIVIDE:
+                case XC_INST_MODULUS:
+                case XC_INST_PLUS:
+                case XC_INST_MINUS:
+                        dbg_exec("BC_INST_binaryop:");
+                        s = zxc_program_op(inst);
+                        break;
+                case XC_INST_BOOL_NOT: {
+                        BcNum *num;
+                        dbg_exec("XC_INST_BOOL_NOT:");
+                        s = zxc_program_prep(&ptr, &num);
+                        if (s) RETURN_STATUS(s);
+                        bc_num_init_DEF_SIZE(&r.d.n);
+                        if (bc_num_cmp(num, &G.prog.zero) == 0)
+                                bc_num_one(&r.d.n);
+                        //else bc_num_zero(&r.d.n); - already is
+                        xc_program_retire(&r, XC_RESULT_TEMP);
+                        break;
+                }
+                case XC_INST_NEG:
+                        dbg_exec("XC_INST_NEG:");
+                        s = zxc_program_negate();
+                        break;
+#if ENABLE_BC
+                case BC_INST_ASSIGN_POWER:
+                case BC_INST_ASSIGN_MULTIPLY:
+                case BC_INST_ASSIGN_DIVIDE:
+                case BC_INST_ASSIGN_MODULUS:
+                case BC_INST_ASSIGN_PLUS:
+                case BC_INST_ASSIGN_MINUS:
+#endif
+                case XC_INST_ASSIGN:
+                        dbg_exec("BC_INST_ASSIGNxyz:");
+                        s = zxc_program_assign(inst);
+                        break;
+#if ENABLE_DC
+                case DC_INST_POP_EXEC:
+                        dbg_exec("DC_INST_POP_EXEC:");
+                        bc_vec_pop(&G.prog.exestack);
+                        goto read_updated_ip;
+                case DC_INST_MODEXP:
+                        dbg_exec("DC_INST_MODEXP:");
+                        s = zdc_program_modexp();
+                        break;
+                case DC_INST_DIVMOD:
+                        dbg_exec("DC_INST_DIVMOD:");
+                        s = zdc_program_divmod();
+                        break;
+                case DC_INST_EXECUTE:
+                case DC_INST_EXEC_COND:
+                        dbg_exec("DC_INST_EXEC[_COND]:");
+                        s = zdc_program_execStr(code, &ip->inst_idx, inst == DC_INST_EXEC_COND);
+                        goto read_updated_ip;
+                case DC_INST_PRINT_STACK: {
+                        size_t idx;
+                        dbg_exec("DC_INST_PRINT_STACK:");
+                        for (idx = 0; idx < G.prog.results.len; ++idx) {
+                                s = zxc_program_print(XC_INST_PRINT, idx);
+                                if (s) break;
+                        }
+                        break;
+                }
+                case DC_INST_CLEAR_STACK:
+                        dbg_exec("DC_INST_CLEAR_STACK:");
+                        bc_vec_pop_all(&G.prog.results);
+                        break;
+                case DC_INST_STACK_LEN:
+                        dbg_exec("DC_INST_STACK_LEN:");
+                        dc_program_stackLen();
+                        break;
+                case DC_INST_DUPLICATE:
+                        dbg_exec("DC_INST_DUPLICATE:");
+                        if (!STACK_HAS_MORE_THAN(&G.prog.results, 0))
+                                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+                        ptr = bc_vec_top(&G.prog.results);
+                        dc_result_copy(&r, ptr);
+                        bc_vec_push(&G.prog.results, &r);
+                        break;
+                case DC_INST_SWAP: {
+                        BcResult *ptr2;
+                        dbg_exec("DC_INST_SWAP:");
+                        if (!STACK_HAS_MORE_THAN(&G.prog.results, 1))
+                                RETURN_STATUS(bc_error_stack_has_too_few_elements());
+                        ptr = bc_vec_item_rev(&G.prog.results, 0);
+                        ptr2 = bc_vec_item_rev(&G.prog.results, 1);
+                        memcpy(&r, ptr, sizeof(BcResult));
+                        memcpy(ptr, ptr2, sizeof(BcResult));
+                        memcpy(ptr2, &r, sizeof(BcResult));
+                        break;
+                }
+                case DC_INST_ASCIIFY:
+                        dbg_exec("DC_INST_ASCIIFY:");
+                        s = zdc_program_asciify();
+                        break;
+                case DC_INST_PRINT_STREAM:
+                        dbg_exec("DC_INST_PRINT_STREAM:");
+                        s = zdc_program_printStream();
+                        break;
+                case DC_INST_LOAD:
+                case DC_INST_PUSH_VAR: {
+                        bool copy = inst == DC_INST_LOAD;
+                        s = zxc_program_pushVar(code, &ip->inst_idx, true, copy);
+                        break;
+                }
+                case DC_INST_PUSH_TO_VAR: {
+                        char *name = xc_program_name(code, &ip->inst_idx);
+                        s = zxc_program_popResultAndCopyToVar(name, true);
+                        free(name);
+                        break;
+                }
+                case DC_INST_QUIT:
+                        dbg_exec("DC_INST_QUIT:");
+                        if (G.prog.exestack.len <= 2)
+                                QUIT_OR_RETURN_TO_MAIN;
+                        bc_vec_npop(&G.prog.exestack, 2);
+                        goto read_updated_ip;
+                case DC_INST_NQUIT:
+                        dbg_exec("DC_INST_NQUIT:");
+                        s = zdc_program_nquit();
+                        //goto read_updated_ip; - just fall through to it
+#endif // ENABLE_DC
+ read_updated_ip:
+                        // Instruction stack has changed, read new pointers
+                        ip = bc_vec_top(&G.prog.exestack);
+                        func = xc_program_func(ip->func);
+                        code = func->code.v;
+                        dbg_exec("func:%zd bytes:%zd ip:%zd", ip->func, func->code.len, ip->inst_idx);
+                }
+
+                if (s || G_interrupt) {
+                        xc_program_reset();
+                        RETURN_STATUS(s);
+                }
+
+                fflush_and_check();
+        }
+
+        RETURN_STATUS(BC_STATUS_SUCCESS);
+}
+#define zxc_program_exec(...) (zxc_program_exec(__VA_ARGS__) COMMA_SUCCESS)
+
+static unsigned xc_vm_envLen(const char *var)
+{
+        char *lenv;
+        unsigned len;
+
+        lenv = getenv(var);
+        len = BC_NUM_PRINT_WIDTH;
+        if (!lenv) return len;
+
+        len = bb_strtou(lenv, NULL, 10) - 1;
+        if (errno || len < 2 || len >= INT_MAX)
+                len = BC_NUM_PRINT_WIDTH;
+
+        return len;
+}
+
+static BC_STATUS zxc_vm_process(const char *text)
+{
+        BcStatus s;
+
+        dbg_lex_enter("%s:%d entered", __func__, __LINE__);
+        s = zxc_parse_text_init(text); // does the first zxc_lex_next()
+        if (s) RETURN_STATUS(s);
+
+        while (G.prs.lex != XC_LEX_EOF) {
+                BcInstPtr *ip;
+                BcFunc *f;
+
+                dbg_lex("%s:%d G.prs.lex:%d, parsing...", __func__, __LINE__, G.prs.lex);
+                if (IS_BC) {
+#if ENABLE_BC
+                        s = zbc_parse_stmt_or_funcdef();
+                        if (s) goto err;
+
+                        // Check that next token is a correct stmt delimiter -
+                        // disallows "print 1 print 2" and such.
+                        if (G.prs.lex != BC_LEX_SCOLON
+                         && G.prs.lex != XC_LEX_NLINE
+                         && G.prs.lex != XC_LEX_EOF
+                        ) {
+                                bc_error_at("bad statement terminator");
+                                goto err;
+                        }
+                        // The above logic is fragile. Check these examples:
+                        // - interactive read() still works
+#endif
+                } else {
+#if ENABLE_DC
+                        s = zdc_parse_expr();
+#endif
+                }
+                if (s || G_interrupt) {
+ err:
+                        xc_parse_reset(); // includes xc_program_reset()
+                        RETURN_STATUS(BC_STATUS_FAILURE);
+                }
+
+                dbg_lex("%s:%d executing...", __func__, __LINE__);
+                s = zxc_program_exec();
+                if (s) {
+                        xc_program_reset();
+                        break;
+                }
+
+                ip = (void*)G.prog.exestack.v;
+#if SANITY_CHECKS
+                if (G.prog.exestack.len != 1) // should have only main's IP
+                        bb_error_msg_and_die("BUG:call stack");
+                if (ip->func != BC_PROG_MAIN)
+                        bb_error_msg_and_die("BUG:not MAIN");
+#endif
+                f = xc_program_func_BC_PROG_MAIN();
+                // bc discards strings, constants and code after each
+                // top-level statement in the "main program".
+                // This prevents "yes 1 | bc" from growing its memory
+                // without bound. This can be done because data stack
+                // is empty and thus can't hold any references to
+                // strings or constants, there is no generated code
+                // which can hold references (after we discard one
+                // we just executed). Code of functions can have references,
+                // but bc stores function strings/constants in per-function
+                // storage.
+                if (IS_BC) {
+#if SANITY_CHECKS
+                        if (G.prog.results.len != 0) // should be empty
+                                bb_error_msg_and_die("BUG:data stack");
+#endif
+                        IF_BC(bc_vec_pop_all(&f->strs);)
+                        IF_BC(bc_vec_pop_all(&f->consts);)
+                        // We are at SCOLON/NLINE, skip it:
+                        s = zxc_lex_next();
+                        if (s) goto err;
+                } else {
+                        if (G.prog.results.len == 0
+                         && G.prog.vars.len == 0
+                        ) {
+                                // If stack is empty and no registers exist (TODO: or they are all empty),
+                                // we can get rid of accumulated strings and constants.
+                                // In this example dc process should not grow
+                                // its memory consumption with time:
+                                // yes 1pc | dc
+                                IF_DC(bc_vec_pop_all(&G.prog.strs);)
+                                IF_DC(bc_vec_pop_all(&G.prog.consts);)
+                        }
+                        // The code is discarded always (below), thus this example
+                        // should also not grow its memory consumption with time,
+                        // even though its data stack is not empty:
+                        // { echo 1; yes dk; } | dc
+                }
+                // We drop generated and executed code for both bc and dc:
+                bc_vec_pop_all(&f->code);
+                ip->inst_idx = 0;
+        }
+
+        dbg_lex_done("%s:%d done", __func__, __LINE__);
+        RETURN_STATUS(s);
+}
+#define zxc_vm_process(...) (zxc_vm_process(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_vm_execute_FILE(FILE *fp, const char *filename)
+{
+        // So far bc/dc have no way to include a file from another file,
+        // therefore we know G.prs.lex_filename == NULL on entry
+        //const char *sv_file;
+        BcStatus s;
+
+        G.prs.lex_filename = filename;
+        G.prs.lex_input_fp = fp;
+        G.err_line = G.prs.lex_line = 1;
+        dbg_lex("p->lex_line reset to 1");
+
+        do {
+                s = zxc_vm_process("");
+                // We do not stop looping on errors here if reading stdin.
+                // Example: start interactive bc and enter "return".
+                // It should say "'return' not in a function"
+                // but should not exit.
+        } while (G.prs.lex_input_fp == stdin);
+        G.prs.lex_filename = NULL;
+        RETURN_STATUS(s);
+}
+#define zxc_vm_execute_FILE(...) (zxc_vm_execute_FILE(__VA_ARGS__) COMMA_SUCCESS)
+
+static BC_STATUS zxc_vm_file(const char *file)
+{
+        BcStatus s;
+        FILE *fp;
+
+        fp = xfopen_for_read(file);
+        s = zxc_vm_execute_FILE(fp, file);
+        fclose(fp);
+
+        RETURN_STATUS(s);
+}
+#define zxc_vm_file(...) (zxc_vm_file(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_BC
+static void bc_vm_info(void)
+{
+        printf("%s "BB_VER"\n"
+                "Adapted from https://github.com/gavinhoward/bc\n"
+                "Original code (c) 2018 Gavin D. Howard and contributors\n"
+        , applet_name);
+}
+
+static void bc_args(char **argv)
+{
+        unsigned opts;
+        int i;
+
+        GETOPT_RESET();
+#if ENABLE_FEATURE_BC_LONG_OPTIONS
+        opts = option_mask32 |= getopt32long(argv, "wvsqli",
+                "warn\0"              No_argument "w"
+                "version\0"           No_argument "v"
+                "standard\0"          No_argument "s"
+                "quiet\0"             No_argument "q"
+                "mathlib\0"           No_argument "l"
+                "interactive\0"       No_argument "i"
+        );
+#else
+        opts = option_mask32 |= getopt32(argv, "wvsqli");
+#endif
+        if (getenv("POSIXLY_CORRECT"))
+                option_mask32 |= BC_FLAG_S;
+
+        if (opts & BC_FLAG_V) {
+                bc_vm_info();
+                exit(0);
+        }
+
+        for (i = optind; argv[i]; ++i)
+                bc_vec_push(&G.files, argv + i);
+}
+
+static void bc_vm_envArgs(void)
+{
+        BcVec v;
+        char *buf;
+        char *env_args = getenv("BC_ENV_ARGS");
+
+        if (!env_args) return;
+
+        G.env_args = xstrdup(env_args);
+        buf = G.env_args;
+
+        bc_vec_init(&v, sizeof(char *), NULL);
+
+        while (*(buf = skip_whitespace(buf)) != '\0') {
+                bc_vec_push(&v, &buf);
+                buf = skip_non_whitespace(buf);
+                if (!*buf)
+                        break;
+                *buf++ = '\0';
+        }
+
+        // NULL terminate, and pass argv[] so that first arg is argv[1]
+        if (sizeof(int) == sizeof(char*)) {
+                bc_vec_push(&v, &const_int_0);
+        } else {
+                static char *const nullptr = NULL;
+                bc_vec_push(&v, &nullptr);
+        }
+        bc_args(((char **)v.v) - 1);
+
+        bc_vec_free(&v);
+}
+
+static const char bc_lib[] ALIGN1 = {
+        "scale=20"
+"\n"    "define e(x){"
+"\n"            "auto b,s,n,r,d,i,p,f,v"
+////////////////"if(x<0)return(1/e(-x))" // and drop 'n' and x<0 logic below
+//^^^^^^^^^^^^^^^^ this would work, and is even more precise than GNU bc:
+//e(-.998896): GNU:.36828580434569428695
+//      above code:.36828580434569428696
+//    actual value:.3682858043456942869594...
+// but for now let's be "GNU compatible"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "if(x<0){"
+"\n"                    "n=1"
+"\n"                    "x=-x"
+"\n"            "}"
+"\n"            "s=scale"
+"\n"            "r=6+s+.44*x"
+"\n"            "scale=scale(x)+1"
+"\n"            "while(x>1){"
+"\n"                    "d+=1"
+"\n"                    "x/=2"
+"\n"                    "scale+=1"
+"\n"            "}"
+"\n"            "scale=r"
+"\n"            "r=x+1"
+"\n"            "p=x"
+"\n"            "f=v=1"
+"\n"            "for(i=2;v;++i){"
+"\n"                    "p*=x"
+"\n"                    "f*=i"
+"\n"                    "v=p/f"
+"\n"                    "r+=v"
+"\n"            "}"
+"\n"            "while(d--)r*=r"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "if(n)return(1/r)"
+"\n"            "return(r/1)"
+"\n"    "}"
+"\n"    "define l(x){"
+"\n"            "auto b,s,r,p,a,q,i,v"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "if(x<=0){"
+"\n"                    "r=(1-10^scale)/1"
+"\n"                    "ibase=b"
+"\n"                    "return(r)"
+"\n"            "}"
+"\n"            "s=scale"
+"\n"            "scale+=6"
+"\n"            "p=2"
+"\n"            "while(x>=2){"
+"\n"                    "p*=2"
+"\n"                    "x=sqrt(x)"
+"\n"            "}"
+"\n"            "while(x<=.5){"
+"\n"                    "p*=2"
+"\n"                    "x=sqrt(x)"
+"\n"            "}"
+"\n"            "r=a=(x-1)/(x+1)"
+"\n"            "q=a*a"
+"\n"            "v=1"
+"\n"            "for(i=3;v;i+=2){"
+"\n"                    "a*=q"
+"\n"                    "v=a/i"
+"\n"                    "r+=v"
+"\n"            "}"
+"\n"            "r*=p"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "return(r/1)"
+"\n"    "}"
+"\n"    "define s(x){"
+"\n"            "auto b,s,r,a,q,i"
+"\n"            "if(x<0)return(-s(-x))"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "s=scale"
+"\n"            "scale=1.1*s+2"
+"\n"            "a=a(1)"
+"\n"            "scale=0"
+"\n"            "q=(x/a+2)/4"
+"\n"            "x-=4*q*a"
+"\n"            "if(q%2)x=-x"
+"\n"            "scale=s+2"
+"\n"            "r=a=x"
+"\n"            "q=-x*x"
+"\n"            "for(i=3;a;i+=2){"
+"\n"                    "a*=q/(i*(i-1))"
+"\n"                    "r+=a"
+"\n"            "}"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "return(r/1)"
+"\n"    "}"
+"\n"    "define c(x){"
+"\n"            "auto b,s"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "s=scale"
+"\n"            "scale*=1.2"
+"\n"            "x=s(2*a(1)+x)"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "return(x/1)"
+"\n"    "}"
+"\n"    "define a(x){"
+"\n"            "auto b,s,r,n,a,m,t,f,i,u"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "n=1"
+"\n"            "if(x<0){"
+"\n"                    "n=-1"
+"\n"                    "x=-x"
+"\n"            "}"
+"\n"            "if(scale<65){"
+"\n"                    "if(x==1)return(.7853981633974483096156608458198757210492923498437764552437361480/n)"
+"\n"                    "if(x==.2)return(.1973955598498807583700497651947902934475851037878521015176889402/n)"
+"\n"            "}"
+"\n"            "s=scale"
+"\n"            "if(x>.2){"
+"\n"                    "scale+=5"
+"\n"                    "a=a(.2)"
+"\n"            "}"
+"\n"            "scale=s+3"
+"\n"            "while(x>.2){"
+"\n"                    "m+=1"
+"\n"                    "x=(x-.2)/(1+.2*x)"
+"\n"            "}"
+"\n"            "r=u=x"
+"\n"            "f=-x*x"
+"\n"            "t=1"
+"\n"            "for(i=3;t;i+=2){"
+"\n"                    "u*=f"
+"\n"                    "t=u/i"
+"\n"                    "r+=t"
+"\n"            "}"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "return((m*a+r)/n)"
+"\n"    "}"
+"\n"    "define j(n,x){"
+"\n"            "auto b,s,o,a,i,v,f"
+"\n"            "b=ibase"
+"\n"            "ibase=A"
+"\n"            "s=scale"
+"\n"            "scale=0"
+"\n"            "n/=1"
+"\n"            "if(n<0){"
+"\n"                    "n=-n"
+"\n"                    "o=n%2"
+"\n"            "}"
+"\n"            "a=1"
+"\n"            "for(i=2;i<=n;++i)a*=i"
+"\n"            "scale=1.5*s"
+"\n"            "a=(x^n)/2^n/a"
+"\n"            "r=v=1"
+"\n"            "f=-x*x/4"
+"\n"            "scale+=length(a)-scale(a)"
+"\n"            "for(i=1;v;++i){"
+"\n"                    "v=v*f/i/(n+i)"
+"\n"                    "r+=v"
+"\n"            "}"
+"\n"            "scale=s"
+"\n"            "ibase=b"
+"\n"            "if(o)a=-a"
+"\n"            "return(a*r/1)"
+"\n"    "}"
+};
+#endif // ENABLE_BC
+
+static BC_STATUS zxc_vm_exec(void)
+{
+        char **fname;
+        BcStatus s;
+        size_t i;
+
+#if ENABLE_BC
+        if (option_mask32 & BC_FLAG_L) {
+                // We know that internal library is not buggy,
+                // thus error checking is normally disabled.
+# define DEBUG_LIB 0
+                s = zxc_vm_process(bc_lib);
+                if (DEBUG_LIB && s) RETURN_STATUS(s);
+        }
+#endif
+
+        s = BC_STATUS_SUCCESS;
+        fname = (void*)G.files.v;
+        for (i = 0; i < G.files.len; i++) {
+                s = zxc_vm_file(*fname++);
+                if (ENABLE_FEATURE_CLEAN_UP && !G_ttyin && s) {
+                        // Debug config, non-interactive mode:
+                        // return all the way back to main.
+                        // Non-debug builds do not come here
+                        // in non-interactive mode, they exit.
+                        RETURN_STATUS(s);
+                }
+        }
+
+        if (IS_BC || (option_mask32 & BC_FLAG_I))
+                s = zxc_vm_execute_FILE(stdin, /*filename:*/ NULL);
+
+        RETURN_STATUS(s);
+}
+#define zxc_vm_exec(...) (zxc_vm_exec(__VA_ARGS__) COMMA_SUCCESS)
+
+#if ENABLE_FEATURE_CLEAN_UP
+static void xc_program_free(void)
+{
+        bc_vec_free(&G.prog.fns);
+        IF_BC(bc_vec_free(&G.prog.fn_map);)
+        bc_vec_free(&G.prog.vars);
+        bc_vec_free(&G.prog.var_map);
+        bc_vec_free(&G.prog.arrs);
+        bc_vec_free(&G.prog.arr_map);
+        IF_DC(bc_vec_free(&G.prog.strs);)
+        IF_DC(bc_vec_free(&G.prog.consts);)
+        bc_vec_free(&G.prog.results);
+        bc_vec_free(&G.prog.exestack);
+        IF_BC(bc_num_free(&G.prog.last);)
+        //IF_BC(bc_num_free(&G.prog.zero);)
+        IF_BC(bc_num_free(&G.prog.one);)
+        bc_vec_free(&G.input_buffer);
+}
+#endif
+
+static void xc_program_init(void)
+{
+        BcInstPtr ip;
+
+        // memset(&G.prog, 0, sizeof(G.prog)); - already is
+        memset(&ip, 0, sizeof(BcInstPtr));
+
+        // G.prog.nchars = G.prog.scale = 0; - already is
+        G.prog.ib_t = 10;
+        G.prog.ob_t = 10;
+
+        IF_BC(bc_num_init_DEF_SIZE(&G.prog.last);)
+        //IF_BC(bc_num_zero(&G.prog.last);) - already is
+
+        //bc_num_init_DEF_SIZE(&G.prog.zero); - not needed
+        //bc_num_zero(&G.prog.zero); - already is
+
+        IF_BC(bc_num_init_DEF_SIZE(&G.prog.one);)
+        IF_BC(bc_num_one(&G.prog.one);)
+
+        bc_vec_init(&G.prog.fns, sizeof(BcFunc), bc_func_free);
+        IF_BC(bc_vec_init(&G.prog.fn_map, sizeof(BcId), bc_id_free);)
+
+        if (IS_BC) {
+                // Names are chosen simply to be distinct and never match
+                // a valid function name (and be short)
+                IF_BC(bc_program_addFunc(xstrdup(""))); // func #0: main
+                IF_BC(bc_program_addFunc(xstrdup("1"))); // func #1: for read()
+        } else {
+                // in dc, functions have no names
+                xc_program_add_fn();
+                xc_program_add_fn();
+        }
+
+        bc_vec_init(&G.prog.vars, sizeof(BcVec), bc_vec_free);
+        bc_vec_init(&G.prog.var_map, sizeof(BcId), bc_id_free);
+
+        bc_vec_init(&G.prog.arrs, sizeof(BcVec), bc_vec_free);
+        bc_vec_init(&G.prog.arr_map, sizeof(BcId), bc_id_free);
+
+        IF_DC(bc_vec_init(&G.prog.strs, sizeof(char *), bc_string_free);)
+        IF_DC(bc_vec_init(&G.prog.consts, sizeof(char *), bc_string_free);)
+        bc_vec_init(&G.prog.results, sizeof(BcResult), bc_result_free);
+        bc_vec_init(&G.prog.exestack, sizeof(BcInstPtr), NULL);
+        bc_vec_push(&G.prog.exestack, &ip);
+
+        bc_char_vec_init(&G.input_buffer);
+}
+
+static int xc_vm_init(const char *env_len)
+{
+        G.prog.len = xc_vm_envLen(env_len);
+#if ENABLE_FEATURE_EDITING
+        G.line_input_state = new_line_input_t(DO_HISTORY);
+#endif
+        bc_vec_init(&G.files, sizeof(char *), NULL);
+
+        xc_program_init();
+        IF_BC(if (IS_BC) bc_vm_envArgs();)
+        xc_parse_create(BC_PROG_MAIN);
+
+//TODO: in GNU bc, the check is (isatty(0) && isatty(1)),
+//-i option unconditionally enables this regardless of isatty():
+        if (isatty(0)) {
+#if ENABLE_FEATURE_BC_INTERACTIVE
+                G_ttyin = 1;
+                // With SA_RESTART, most system calls will restart
+                // (IOW: they won't fail with EINTR).
+                // In particular, this means ^C won't cause
+                // stdout to get into "error state" if SIGINT hits
+                // within write() syscall.
+                //
+                // The downside is that ^C while tty input is taken
+                // will only be handled after [Enter] since read()
+                // 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)
+                signal_SA_RESTART_empty_mask(SIGINT, record_signo);
+
+                // Without SA_RESTART, this exhibits a bug:
+                // "while (1) print 1" and try ^C-ing it.
+                // Intermittently, instead of returning to input line,
+                // you'll get "output error: Interrupted system call"
+                // and exit.
+                //signal_no_SA_RESTART_empty_mask(SIGINT, record_signo);
+#endif
+                return 1; // "tty"
+        }
+        return 0; // "not a tty"
+}
+
+static BcStatus xc_vm_run(void)
+{
+        BcStatus st = zxc_vm_exec();
+#if ENABLE_FEATURE_CLEAN_UP
+        if (G_exiting) // it was actually "halt" or "quit"
+                st = EXIT_SUCCESS;
+
+        bc_vec_free(&G.files);
+        xc_program_free();
+        xc_parse_free();
+        free(G.env_args);
+# if ENABLE_FEATURE_EDITING
+        free_line_input_t(G.line_input_state);
+# endif
+        FREE_G();
+#endif
+        dbg_exec("exiting with exitcode %d", st);
+        return st;
+}
+
+#if ENABLE_BC
+int bc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int bc_main(int argc UNUSED_PARAM, char **argv)
+{
+        int is_tty;
+
+        INIT_G();
+
+        is_tty = xc_vm_init("BC_LINE_LENGTH");
+
+        bc_args(argv);
+
+        if (is_tty && !(option_mask32 & BC_FLAG_Q))
+                bc_vm_info();
+
+        return xc_vm_run();
+}
+#endif
+
+#if ENABLE_DC
+int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dc_main(int argc UNUSED_PARAM, char **argv)
+{
+        int noscript;
+
+        INIT_G();
+
+        // TODO: dc (GNU bc 1.07.1) 1.4.1 seems to use width
+        // 1 char wider than bc from the same package.
+        // Both default width, and xC_LINE_LENGTH=N are wider:
+        // "DC_LINE_LENGTH=5 dc -e'123456 p'" prints:
+        //      |1234\   |
+        //      |56      |
+        // "echo '123456' | BC_LINE_LENGTH=5 bc" prints:
+        //      |123\    |
+        //      |456     |
+        // Do the same, or it's a bug?
+        xc_vm_init("DC_LINE_LENGTH");
+
+        // Run -e'SCRIPT' and -fFILE in order of appearance, then handle FILEs
+        noscript = BC_FLAG_I;
+        for (;;) {
+                int n = getopt(argc, argv, "e:f:x");
+                if (n <= 0)
+                        break;
+                switch (n) {
+                case 'e':
+                        noscript = 0;
+                        n = zxc_vm_process(optarg);
+                        if (n) return n;
+                        break;
+                case 'f':
+                        noscript = 0;
+                        n = zxc_vm_file(optarg);
+                        if (n) return n;
+                        break;
+                case 'x':
+                        option_mask32 |= DC_FLAG_X;
+                        break;
+                default:
+                        bb_show_usage();
+                }
+        }
+        argv += optind;
+
+        while (*argv) {
+                noscript = 0;
+                bc_vec_push(&G.files, argv++);
+        }
+
+        option_mask32 |= noscript; // set BC_FLAG_I if we need to interpret stdin
+
+        return xc_vm_run();
+}
+#endif
+
+#endif // DC_BIG
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 0c8a8225e..92faa1cd5 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config BEEP
-//config:       bool "beep (3 kb)"
+//config:       bool "beep (2.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 2dfe52c4f..5183d1369 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CHAT
-//config:       bool "chat (6.6 kb)"
+//config:       bool "chat (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       Simple chat utility.
diff --git a/miscutils/crond.c b/miscutils/crond.c
index f6580a9d4..2e36c406b 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CROND
-//config:       bool "crond (13 kb)"
+//config:       bool "crond (14 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index 4787fa08f..96dc4741a 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CRONTAB
-//config:       bool "crontab (9.7 kb)"
+//config:       bool "crontab (10 kb)"
 //config:       default y
 //config:       help
 //config:       Crontab manipulates the crontab for a particular user. Only
diff --git a/miscutils/dc.c b/miscutils/dc.c
index f752a1377..0d09f5e2b 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -2,50 +2,11 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-//config:config DC
-//config:       bool "dc (4.2 kb)"
-//config:       default y
-//config:       help
-//config:       Dc is a reverse-polish desk calculator which supports unlimited
-//config:       precision arithmetic.
-//config:
-//config:config FEATURE_DC_LIBM
-//config:       bool "Enable power and exp functions (requires libm)"
-//config:       default y
-//config:       depends on DC
-//config:       help
-//config:       Enable power and exp functions.
-//config:       NOTE: This will require libm to be present for linking.
-
-//applet:IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_DC) += dc.o
-
-//usage:#define dc_trivial_usage
-//usage:       "EXPRESSION..."
-//usage:
-//usage:#define dc_full_usage "\n\n"
-//usage:       "Tiny RPN calculator. Operations:\n"
-//usage:       "+, add, -, sub, *, mul, /, div, %, mod, "IF_FEATURE_DC_LIBM("**, exp, ")"and, or, not, xor,\n"
-//usage:       "p - print top of the stack (without popping),\n"
-//usage:       "f - print entire stack,\n"
-//usage:       "o - pop the value and set output radix (must be 10, 16, 8 or 2).\n"
-//usage:       "Examples: 'dc 2 2 add p' -> 4, 'dc 8 8 mul 2 2 + / p' -> 16"
-//usage:
-//usage:#define dc_example_usage
-//usage:       "$ dc 2 2 + p\n"
-//usage:       "4\n"
-//usage:       "$ dc 8 8 \\* 2 2 + / p\n"
-//usage:       "16\n"
-//usage:       "$ dc 0 1 and p\n"
-//usage:       "0\n"
-//usage:       "$ dc 0 1 or p\n"
-//usage:       "1\n"
-//usage:       "$ echo 72 9 div 8 mul p | dc\n"
-//usage:       "64\n"
-
-#include "libbb.h"
-#include "common_bufsiz.h"
+
+/* config/applet/usage bits are in bc.c */
+
+//#include "libbb.h"
+//#include "common_bufsiz.h"
 #include <math.h>
 
 #if 0
@@ -59,7 +20,6 @@ typedef unsigned long long data_t;
 #define DATA_FMT LL_FMT
 #endif
 
-
 struct globals {
         unsigned pointer;
         unsigned base;
@@ -75,7 +35,6 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
         base = 10; \
 } while (0)
 
-
 static void check_under(void)
 {
         if (pointer == 0)
@@ -223,25 +182,25 @@ struct op {
 
 static const struct op operators[] = {
 #if ENABLE_FEATURE_DC_LIBM
-        {"**",  power},
-        {"exp", power},
-        {"pow", power},
+        {"^",   power},
+//      {"exp", power},
+//      {"pow", power},
 #endif
         {"%",   mod},
-        {"mod", mod},
+//      {"mod", mod},
+        // logic ops are not standard, remove?
         {"and", and},
         {"or",  or},
         {"not", not},
-        {"eor", eor},
         {"xor", eor},
         {"+",   add},
-        {"add", add},
+//      {"add", add},
         {"-",   sub},
-        {"sub", sub},
+//      {"sub", sub},
         {"*",   mul},
-        {"mul", mul},
+//      {"mul", mul},
         {"/",   divide},
-        {"div", divide},
+//      {"div", divide},
         {"p", print_no_pop},
         {"f", print_stack_no_pop},
         {"o", set_output_base},
@@ -282,23 +241,50 @@ static void stack_machine(const char *argument)
         bb_error_msg_and_die("syntax error at '%s'", argument);
 }
 
+static void process_file(FILE *fp)
+{
+        char *line;
+        while ((line = xmalloc_fgetline(fp)) != NULL) {
+                stack_machine(line);
+                free(line);
+        }
+}
+
 int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dc_main(int argc UNUSED_PARAM, char **argv)
 {
+        bool script = 0;
+
         INIT_G();
 
-        argv++;
-        if (!argv[0]) {
-                /* take stuff from stdin if no args are given */
-                char *line;
-                while ((line = xmalloc_fgetline(stdin)) != NULL) {
-                        stack_machine(line);
-                        free(line);
+        /* Run -e'SCRIPT' and -fFILE in order of appearance, then handle FILEs */
+        for (;;) {
+                int n = getopt(argc, argv, "e:f:");
+                if (n <= 0)
+                        break;
+                switch (n) {
+                case 'e':
+                        script = 1;
+                        stack_machine(optarg);
+                        break;
+                case 'f':
+                        script = 1;
+                        process_file(xfopen_for_read(optarg));
+                        break;
+                default:
+                        bb_show_usage();
                 }
-        } else {
-                do {
-                        stack_machine(*argv);
-                } while (*++argv);
         }
+        argv += optind;
+
+        if (*argv) {
+                do
+                        process_file(xfopen_for_read(*argv++));
+                while (*argv);
+        } else if (!script) {
+                /* Take stuff from stdin if no args are given */
+                process_file(stdin);
+        }
+
         return EXIT_SUCCESS;
 }
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 814714f53..3bf06b965 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -694,7 +694,7 @@ static void process_config_line(const char *line, unsigned long *event_mask)
         return;
 
  process_config_line_err:
-        msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
+        msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg, line);
 }  /*  End Function process_config_line   */
 
 static int do_servicing(int fd, unsigned long event_mask)
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index bc3c61055..bba22d6d1 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -21,7 +21,7 @@
  *   "exit" (or just close fifo) - well you guessed it.
  */
 //config:config FBSPLASH
-//config:       bool "fbsplash (27 kb)"
+//config:       bool "fbsplash (26 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 8e93060ca..a3dabdadb 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FLASH_ERASEALL
-//config:       bool "flash_eraseall (5.5 kb)"
+//config:       bool "flash_eraseall (5.9 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
 //config:       The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 858cee194..1ca9d158d 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FLASHCP
-//config:       bool "flashcp (5.4 kb)"
+//config:       bool "flashcp (5.3 kb)"
 //config:       default n  # doesn't build on Ubuntu 8.04
 //config:       help
 //config:       The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 0bbe6ca10..342e240fa 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -12,7 +12,7 @@
  *          - by Mark Lord (C) 1994-2002 -- freely distributable
  */
 //config:config HDPARM
-//config:       bool "hdparm (23 kb)"
+//config:       bool "hdparm (25 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c
index 298eb8149..5c2f4a555 100644
--- a/miscutils/hexedit.c
+++ b/miscutils/hexedit.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config HEXEDIT
-//config:       bool "hexedit (20 kb)"
+//config:       bool "hexedit (21 kb)"
 //config:       default y
 //config:       help
 //config:       Edit file in hexadecimal.
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 6a2134063..610fed5d6 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -9,28 +9,28 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config I2CGET
-//config:       bool "i2cget (5.6 kb)"
+//config:       bool "i2cget (5.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Read from I2C/SMBus chip registers.
 //config:
 //config:config I2CSET
-//config:       bool "i2cset (6.9 kb)"
+//config:       bool "i2cset (6.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Set I2C registers.
 //config:
 //config:config I2CDUMP
-//config:       bool "i2cdump (7.2 kb)"
+//config:       bool "i2cdump (7.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Examine I2C registers.
 //config:
 //config:config I2CDETECT
-//config:       bool "i2cdetect (7.2 kb)"
+//config:       bool "i2cdetect (7.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 0060797ed..ec0321941 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -27,7 +27,7 @@
  * See below for mask names explanation.
  */
 //config:config INOTIFYD
-//config:       bool "inotifyd (3.5 kb)"
+//config:       bool "inotifyd (3.6 kb)"
 //config:       default n  # doesn't build on Knoppix 5
 //config:       help
 //config:       Simple inotify daemon. Reports filesystem changes. Requires
diff --git a/miscutils/less.c b/miscutils/less.c
index 6b5c8c2dd..ad23b7d0d 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -20,7 +20,7 @@
  *   redirected input has been read from stdin
  */
 //config:config LESS
-//config:       bool "less (15 kb)"
+//config:       bool "less (16 kb)"
 //config:       default y
 //config:       help
 //config:       'less' is a pager, meaning that it displays text files. It possesses
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index 0aaa01ded..f737d33d9 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSSCSI
-//config:       bool "lsscsi (2.4 kb)"
+//config:       bool "lsscsi (2.5 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 80975c652..93c550042 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -7,7 +7,7 @@
  * known bugs: can't deal with alpha ranges
  */
 //config:config MAKEDEVS
-//config:       bool "makedevs (9.3 kb)"
+//config:       bool "makedevs (9.2 kb)"
 //config:       default y
 //config:       help
 //config:       'makedevs' is a utility used to create a batch of devices with
diff --git a/miscutils/man.c b/miscutils/man.c
index 4ff58a9a0..fd5d90c1a 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MAN
-//config:       bool "man (27 kb)"
+//config:       bool "man (26 kb)"
 //config:       default y
 //config:       help
 //config:       Format and display manual pages.
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index fa090057e..399d4cf7f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MICROCOM
-//config:       bool "microcom (5.6 kb)"
+//config:       bool "microcom (5.7 kb)"
 //config:       default y
 //config:       help
 //config:       The poor man's minicom utility for chatting with serial port devices.
diff --git a/miscutils/mt.c b/miscutils/mt.c
index fad656e95..9f1aecfca 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MT
-//config:       bool "mt (2.6 kb)"
+//config:       bool "mt (2.5 kb)"
 //config:       default y
 //config:       help
 //config:       mt is used to control tape devices. You can use the mt utility
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 29c800612..09bcaaf63 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -8,14 +8,14 @@
  * TODO: add support for large (>4GB) MTD devices
  */
 //config:config NANDWRITE
-//config:       bool "nandwrite (5.9 kb)"
+//config:       bool "nandwrite (4.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Write to the specified MTD device, with bad blocks awareness
 //config:
 //config:config NANDDUMP
-//config:       bool "nanddump (6.3 kb)"
+//config:       bool "nanddump (5.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
index d1ae27348..0abed6ff1 100644
--- a/miscutils/partprobe.c
+++ b/miscutils/partprobe.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PARTPROBE
-//config:       bool "partprobe (3.6 kb)"
+//config:       bool "partprobe (3.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index d315c2734..39816ab1f 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RAIDAUTORUN
-//config:       bool "raidautorun (1.4 kb)"
+//config:       bool "raidautorun (1.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index 972302a18..cc0ba5ba3 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READAHEAD
-//config:       bool "readahead (2 kb)"
+//config:       bool "readahead (1.5 kb)"
 //config:       default y
 //config:       depends on LFS
 //config:       select PLATFORM_LINUX
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index ae38c182d..766bad8c7 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RFKILL
-//config:       bool "rfkill (5.3 kb)"
+//config:       bool "rfkill (4.4 kb)"
 //config:       default n # doesn't build on Ubuntu 9.04
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
index 0b2098564..2f1581ead 100644
--- a/miscutils/runlevel.c
+++ b/miscutils/runlevel.c
@@ -12,11 +12,11 @@
  * initially busyboxified by Bernhard Reutner-Fischer
  */
 //config:config RUNLEVEL
-//config:       bool "runlevel (518 bytes)"
+//config:       bool "runlevel (559 bytes)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
-//config:       find the current and previous system runlevel.
+//config:       Find the current and previous system runlevel.
 //config:
 //config:       This applet uses utmp but does not rely on busybox supporing
 //config:       utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
diff --git a/miscutils/setfattr.c b/miscutils/setfattr.c
index 12eebc56e..9792c2660 100644
--- a/miscutils/setfattr.c
+++ b/miscutils/setfattr.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SETFATTR
-//config:       bool "setfattr (3.6 kb)"
+//config:       bool "setfattr (3.7 kb)"
 //config:       default y
 //config:       help
 //config:       Set/delete extended attributes on files
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index fd88ed106..71b274568 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETSERIAL
-//config:       bool "setserial (6.6 kb)"
+//config:       bool "setserial (6.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/strings.c b/miscutils/strings.c
index ccb05f6d4..51412f401 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config STRINGS
-//config:       bool "strings (4.3 kb)"
+//config:       bool "strings (4.6 kb)"
 //config:       default y
 //config:       help
 //config:       strings prints the printable character sequences for each file
diff --git a/miscutils/time.c b/miscutils/time.c
index 7d6a7a29f..064888ab8 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -10,7 +10,7 @@
  * Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
  */
 //config:config TIME
-//config:       bool "time (7 kb)"
+//config:       bool "time (6.8 kb)"
 //config:       default y
 //config:       help
 //config:       The time command runs the specified program with the given arguments.
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index 2c2d4ec33..d635b29ce 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TTYSIZE
-//config:       bool "ttysize (372 bytes)"
+//config:       bool "ttysize (432 bytes)"
 //config:       default y
 //config:       help
 //config:       A replacement for "stty size". Unlike stty, can report only width,
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index a947abab5..dc7af25a4 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -4,42 +4,42 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UBIATTACH
-//config:       bool "ubiattach (4.7 kb)"
+//config:       bool "ubiattach (4.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Attach MTD device to an UBI device.
 //config:
 //config:config UBIDETACH
-//config:       bool "ubidetach (4.6 kb)"
+//config:       bool "ubidetach (4.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Detach MTD device from an UBI device.
 //config:
 //config:config UBIMKVOL
-//config:       bool "ubimkvol (5.8 kb)"
+//config:       bool "ubimkvol (5.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Create a UBI volume.
 //config:
 //config:config UBIRMVOL
-//config:       bool "ubirmvol (5.2 kb)"
+//config:       bool "ubirmvol (4.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Delete a UBI volume.
 //config:
 //config:config UBIRSVOL
-//config:       bool "ubirsvol (4.6 kb)"
+//config:       bool "ubirsvol (4.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Resize a UBI volume.
 //config:
 //config:config UBIUPDATEVOL
-//config:       bool "ubiupdatevol (5.6 kb)"
+//config:       bool "ubiupdatevol (5.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
index ecc8fe137..21bd10111 100644
--- a/miscutils/ubirename.c
+++ b/miscutils/ubirename.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UBIRENAME
-//config:       bool "ubirename (2.2 kb)"
+//config:       bool "ubirename (2.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/miscutils/volname.c b/miscutils/volname.c
index 6e6bbaa44..027d01272 100644
--- a/miscutils/volname.c
+++ b/miscutils/volname.c
@@ -28,7 +28,7 @@
  * Matthew Stoltenberg <d3matt@gmail.com>
  */
 //config:config VOLNAME
-//config:       bool "volname (1.7 kb)"
+//config:       bool "volname (1.6 kb)"
 //config:       default y
 //config:       help
 //config:       Prints a CD-ROM volume name.
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 392d05646..1e9ecc5e8 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WATCHDOG
-//config:       bool "watchdog (5.1 kb)"
+//config:       bool "watchdog (5.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/modutils/depmod.c b/modutils/depmod.c
index 004c67a11..b5244fc60 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DEPMOD
-//config:       bool "depmod (26 kb)"
+//config:       bool "depmod (27 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 84860cd79..694205fda 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSMOD
-//config:       bool "lsmod (4.3 kb)"
+//config:       bool "lsmod (1.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 3f91622a9..1e63f745f 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MODINFO
-//config:       bool "modinfo (25 kb)"
+//config:       bool "modinfo (24 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 291e4cb90..0a372a049 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MODPROBE
-//config:       bool "modprobe (29 kb)"
+//config:       bool "modprobe (28 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index df50e58af..a3548879c 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RMMOD
-//config:       bool "rmmod (3.6 kb)"
+//config:       bool "rmmod (3.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/Config.src b/networking/Config.src
index 2ce5287de..04d644bc9 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -46,6 +46,17 @@ config VERBOSE_RESOLUTION_ERRORS
         "can't resolve 'hostname.com'" and want to know more.
         This may increase size of your executable a bit.
 
+config FEATURE_TLS_SHA1
+        bool "In TLS code, support ciphers which use deprecated SHA1"
+        depends on TLS
+        default n
+        help
+        Selecting this option increases interoperability with very old
+        servers, but slightly increases code size.
+
+        Most TLS servers support SHA256 today (2018), since SHA1 is
+        considered possibly insecure (although not yet definitely broken).
+
 INSERT
 
 source networking/udhcp/Config.in
diff --git a/networking/arp.c b/networking/arp.c
index 177ab1571..71bfe3cbf 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -13,7 +13,7 @@
  * modified for getopt32 by Arne Bernin <arne [at] alamut.de>
  */
 //config:config ARP
-//config:       bool "arp (11 kb)"
+//config:       bool "arp (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/arping.c b/networking/arping.c
index 788fded3c..901578b68 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -6,7 +6,7 @@
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 //config:config ARPING
-//config:       bool "arping (9.3 kb)"
+//config:       bool "arping (9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 6677f07d5..acaac16f8 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -64,7 +64,7 @@
  *   filter.  That configuration consumes more power.
  */
 //config:config ETHER_WAKE
-//config:       bool "ether-wake (6.6 kb)"
+//config:       bool "ether-wake (4.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 84ca547ff..bff90538f 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,13 +13,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FTPGET
-//config:       bool "ftpget (8 kb)"
+//config:       bool "ftpget (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Retrieve a remote file via FTP.
 //config:
 //config:config FTPPUT
-//config:       bool "ftpput (7.7 kb)"
+//config:       bool "ftpput (7.5 kb)"
 //config:       default y
 //config:       help
 //config:       Store a remote file via FTP.
diff --git a/networking/hostname.c b/networking/hostname.c
index 8e3238d99..248d8b65a 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HOSTNAME
-//config:       bool "hostname (5.6 kb)"
+//config:       bool "hostname (5.5 kb)"
 //config:       default y
 //config:       help
 //config:       Show or set the system's host name.
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 9a67d24d8..026ff1cc8 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IFPLUGD
-//config:       bool "ifplugd (9.9 kb)"
+//config:       bool "ifplugd (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 80fce87a6..8a6efc976 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -17,7 +17,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IFUP
-//config:       bool "ifup (17 kb)"
+//config:       bool "ifup (14 kb)"
 //config:       default y
 //config:       help
 //config:       Activate the specified interfaces. This applet makes use
@@ -33,7 +33,7 @@
 //config:       via busybox or via standalone utilities.
 //config:
 //config:config IFDOWN
-//config:       bool "ifdown (15 kb)"
+//config:       bool "ifdown (13 kb)"
 //config:       default y
 //config:       help
 //config:       Deactivate the specified interfaces.
diff --git a/networking/inetd.c b/networking/inetd.c
index ca1a97268..8f871ee12 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -488,7 +488,7 @@ static void block_CHLD_HUP_ALRM(sigset_t *m)
         sigaddset(m, SIGCHLD);
         sigaddset(m, SIGHUP);
         sigaddset(m, SIGALRM);
-        sigprocmask(SIG_BLOCK, m, m); /* old sigmask is stored in m */
+        sigprocmask2(SIG_BLOCK, m); /* old sigmask is stored in m */
 }
 
 static void restore_sigmask(sigset_t *m)
diff --git a/networking/ip.c b/networking/ip.c
index 97d618cd9..034ee4fc8 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -9,7 +9,7 @@
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 //config:config IP
-//config:       bool "ip (34 kb)"
+//config:       bool "ip (35 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -28,7 +28,7 @@
 //config:       Short form of "ip addr"
 //config:
 //config:config IPLINK
-//config:       bool "iplink (16 kb)"
+//config:       bool "iplink (17 kb)"
 //config:       default y
 //config:       select FEATURE_IP_LINK
 //config:       select PLATFORM_LINUX
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index cdae8eea8..67f768836 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,7 +12,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCALC
-//config:       bool "ipcalc (4.3 kb)"
+//config:       bool "ipcalc (4.4 kb)"
 //config:       default y
 //config:       help
 //config:       ipcalc takes an IP address and netmask and calculates the
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 0c33dde4f..f564d604a 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FAKEIDENTD
-//config:       bool "fakeidentd (8.9 kb)"
+//config:       bool "fakeidentd (8.7 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 9ec665b69..d088caf4c 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -327,6 +327,10 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
                 ifa->ifa_flags &= ~IFA_F_TENTATIVE;
                 printf("tentative ");
         }
+        if (ifa->ifa_flags & IFA_F_DADFAILED) {
+                ifa->ifa_flags &= ~IFA_F_DADFAILED;
+                printf("dadfailed ");
+        }
         if (ifa->ifa_flags & IFA_F_DEPRECATED) {
                 ifa->ifa_flags &= ~IFA_F_DEPRECATED;
                 printf("deprecated ");
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 103756b59..0dc8d0c43 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config NBDCLIENT
-//config:       bool "nbd-client (4.6 kb)"
+//config:       bool "nbd-client (6 kb)"
 //config:       default y
 //config:       help
 //config:       Network block device client
@@ -163,7 +163,9 @@ int nbdclient_main(int argc, char **argv)
                 int sock, nbd;
                 int ro;
                 int proto_new; // 0 for old, 1 for new
+#if BB_MMU
                 char *data;
+#endif
 
                 // Make sure BLOCKDEV exists
                 nbd = xopen(device, O_RDWR);
@@ -200,7 +202,9 @@ int nbdclient_main(int argc, char **argv)
                         ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks);
                         ioctl(nbd, NBD_CLEAR_SOCK);
                         ro = !!(old_nbd_header.flags & htons(2));
+#if BB_MMU
                         data = old_nbd_header.data;
+#endif
                 } else {
                         unsigned namelen;
                         uint16_t handshake_flags;
@@ -230,7 +234,9 @@ int nbdclient_main(int argc, char **argv)
                         ioctl(nbd, NBD_SET_FLAGS,
                                         ntohs(new_nbd_header.transmission_flags));
                         ro = !!(new_nbd_header.transmission_flags & htons(2));
+#if BB_MMU
                         data = new_nbd_header.data;
+#endif
                 }
 
                 if (ioctl(nbd, BLKROSET, &ro) < 0) {
diff --git a/networking/nslookup.c b/networking/nslookup.c
index e153eb585..24e09d4f0 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 
 //config:config NSLOOKUP
-//config:       bool "nslookup (4.5 kb)"
+//config:       bool "nslookup (9.7 kb)"
 //config:       default y
 //config:       help
 //config:       nslookup is a tool to query Internet name servers.
@@ -257,7 +257,7 @@ int nslookup_main(int argc, char **argv)
 struct ns {
         const char *name;
         len_and_sockaddr *lsa;
-        int failures;
+        //UNUSED: int failures;
         int replies;
 };
 
@@ -320,6 +320,7 @@ struct globals {
         struct query *query;
         char *search;
         smalluint have_search_directive;
+        smalluint exitcode;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -593,7 +594,7 @@ static int send_queries(struct ns *ns)
 
                 /* Retry immediately on SERVFAIL */
                 if (rcode == 2) {
-                        ns->failures++;
+                        //UNUSED: ns->failures++;
                         if (servfail_retry) {
                                 servfail_retry--;
                                 write(pfd.fd, G.query[qn].query, G.query[qn].qlen);
@@ -612,9 +613,12 @@ static int send_queries(struct ns *ns)
                 if (rcode != 0) {
                         printf("** server can't find %s: %s\n",
                                         G.query[qn].name, rcodes[rcode]);
+                        G.exitcode = EXIT_FAILURE;
                 } else {
-                        if (parse_reply(reply, recvlen) < 0)
+                        if (parse_reply(reply, recvlen) < 0) {
                                 printf("*** Can't find %s: Parse error\n", G.query[qn].name);
+                                G.exitcode = EXIT_FAILURE;
+                        }
                 }
                 bb_putchar('\n');
                 n_replies++;
@@ -988,7 +992,7 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
                 free(G.query);
         }
 
-        return EXIT_SUCCESS;
+        return G.exitcode;
 }
 
 #endif
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 041cac762..855815ece 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -41,7 +41,7 @@
  ***********************************************************************
  */
 //config:config NTPD
-//config:       bool "ntpd (17 kb)"
+//config:       bool "ntpd (22 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/ping.c b/networking/ping.c
index 570184fee..b534c74c7 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -25,7 +25,7 @@
  * The code was modified by Bart Visscher <magick@linux-fan.com>
  */
 //config:config PING
-//config:       bool "ping (9.5 kb)"
+//config:       bool "ping (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -33,7 +33,7 @@
 //config:       elicit an ICMP ECHO_RESPONSE from a host or gateway.
 //config:
 //config:config PING6
-//config:       bool "ping6 (10 kb)"
+//config:       bool "ping6 (11 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
diff --git a/networking/pscan.c b/networking/pscan.c
index 95b0a937d..2715ef2df 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PSCAN
-//config:       bool "pscan (6.6 kb)"
+//config:       bool "pscan (6 kb)"
 //config:       default y
 //config:       help
 //config:       Simple network port scanner.
diff --git a/networking/route.c b/networking/route.c
index 8387ce1bb..ac1d94c28 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,7 +25,7 @@
  * remove ridiculous amounts of bloat.
  */
 //config:config ROUTE
-//config:       bool "route (8.9 kb)"
+//config:       bool "route (8.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/slattach.c b/networking/slattach.c
index e0a388926..c6feca248 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -13,7 +13,7 @@
  * - The -F options allows disabling of RTS/CTS flow control.
  */
 //config:config SLATTACH
-//config:       bool "slattach (6.1 kb)"
+//config:       bool "slattach (6.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index 49aec6b99..cd0ee5722 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SSL_CLIENT
-//config:       bool "ssl_client (23 kb)"
+//config:       bool "ssl_client (25 kb)"
 //config:       default y
 //config:       select TLS
 //config:       help
diff --git a/networking/tc.c b/networking/tc.c
index 4fa3e47bf..3e9808328 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -7,7 +7,7 @@
  * Bernhard Reutner-Fischer adjusted for busybox
  */
 //config:config TC
-//config:       bool "tc (3.1 kb)"
+//config:       bool "tc (8.3 kb)"
 //config:       default y
 //config:       help
 //config:       Show / manipulate traffic control settings
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index c914221ae..a0af64981 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -29,7 +29,7 @@
  * - don't know how to retrieve ORIGDST for udp.
  */
 //config:config TCPSVD
-//config:       bool "tcpsvd (13 kb)"
+//config:       bool "tcpsvd (14 kb)"
 //config:       default y
 //config:       help
 //config:       tcpsvd listens on a TCP port and runs a program for each new
diff --git a/networking/telnet.c b/networking/telnet.c
index 1e6be85bd..fa1628723 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -20,7 +20,7 @@
  * by Fernando Silveira <swrh@gmx.net>
  */
 //config:config TELNET
-//config:       bool "telnet (8.7 kb)"
+//config:       bool "telnet (8.8 kb)"
 //config:       default y
 //config:       help
 //config:       Telnet is an interface to the TELNET protocol, but is also commonly
@@ -94,19 +94,19 @@ enum {
         IACBUFSIZE  = 128,
 
         CHM_TRY = 0,
-        CHM_ON = 1,
+        CHM_ON  = 1,
         CHM_OFF = 2,
 
         UF_ECHO = 0x01,
-        UF_SGA = 0x02,
+        UF_SGA  = 0x02,
 
         TS_NORMAL = 0,
         TS_COPY = 1,
-        TS_IAC = 2,
-        TS_OPT = 3,
+        TS_IAC  = 2,
+        TS_OPT  = 3,
         TS_SUB1 = 4,
         TS_SUB2 = 5,
-        TS_CR = 6,
+        TS_CR   = 6,
 };
 
 typedef unsigned char byte;
@@ -152,8 +152,10 @@ static void subneg(byte c);
 
 static void iac_flush(void)
 {
-        full_write(netfd, G.iacbuf, G.iaclen);
-        G.iaclen = 0;
+        if (G.iaclen != 0) {
+                full_write(netfd, G.iacbuf, G.iaclen);
+                G.iaclen = 0;
+        }
 }
 
 static void doexit(int ev) NORETURN;
@@ -244,25 +246,34 @@ static void handle_net_output(int len)
 
 static void handle_net_input(int len)
 {
+        byte c;
         int i;
-        int cstart = 0;
-
-        for (i = 0; i < len; i++) {
-                byte c = G.buf[i];
-
-                if (G.telstate == TS_NORMAL) { /* most typical state */
-                        if (c == IAC) {
-                                cstart = i;
-                                G.telstate = TS_IAC;
-                        }
-                        else if (c == '\r') {
-                                cstart = i + 1;
-                                G.telstate = TS_CR;
-                        }
-                        /* No IACs were seen so far, no need to copy
-                         * bytes within G.buf: */
-                        continue;
+        int cstart = cstart; /* for compiler */
+
+        i = 0;
+        //bb_error_msg("[%u,'%.*s']", G.telstate, len, G.buf);
+        if (G.telstate == TS_NORMAL) { /* most typical state */
+                while (i < len) {
+                        c = G.buf[i];
+                        i++;
+                        if (c == IAC) /* unlikely */
+                                goto got_IAC;
+                        if (c != '\r') /* likely */
+                                continue;
+                        G.telstate = TS_CR;
+                        cstart = i;
+                        goto got_special;
                 }
+                full_write(STDOUT_FILENO, G.buf, len);
+                return;
+ got_IAC:
+                G.telstate = TS_IAC;
+                cstart = i - 1;
+ got_special: ;
+        }
+
+        for (; i < len; i++) {
+                c = G.buf[i];
 
                 switch (G.telstate) {
                 case TS_CR:
@@ -278,20 +289,19 @@ static void handle_net_input(int len)
                         /* Similar to NORMAL, but in TS_COPY we need to copy bytes */
                         if (c == IAC)
                                 G.telstate = TS_IAC;
-                        else
+                        else {
                                 G.buf[cstart++] = c;
-                        if (c == '\r')
-                                G.telstate = TS_CR;
+                                if (c == '\r')
+                                        G.telstate = TS_CR;
+                        }
                         break;
 
                 case TS_IAC: /* Prev char was IAC */
-                        if (c == IAC) { /* IAC IAC -> one IAC */
+                        switch (c) {
+                        case IAC: /* IAC IAC -> one IAC */
                                 G.buf[cstart++] = c;
                                 G.telstate = TS_COPY;
                                 break;
-                        }
-                        /* else */
-                        switch (c) {
                         case SB:
                                 G.telstate = TS_SUB1;
                                 break;
@@ -320,103 +330,83 @@ static void handle_net_input(int len)
                 }
         }
 
-        if (G.telstate != TS_NORMAL) {
-                /* We had some IACs, or CR */
-                if (G.iaclen)
-                        iac_flush();
-                if (G.telstate == TS_COPY) /* we aren't in the middle of IAC */
-                        G.telstate = TS_NORMAL;
-                len = cstart;
-        }
-
-        if (len)
-                full_write(STDOUT_FILENO, G.buf, len);
+        /* We had some IACs, or CR */
+        iac_flush();
+        if (G.telstate == TS_COPY) /* we aren't in the middle of IAC */
+                G.telstate = TS_NORMAL;
+        if (cstart != 0)
+                full_write(STDOUT_FILENO, G.buf, cstart);
 }
 
 static void put_iac(int c)
 {
-        G.iacbuf[G.iaclen++] = c;
+        int iaclen = G.iaclen;
+        if (iaclen >= IACBUFSIZE) {
+                iac_flush();
+                iaclen = 0;
+        }
+        G.iacbuf[iaclen] = c; /* "... & 0xff" is implicit */
+        G.iaclen = iaclen + 1;
 }
 
-static void put_iac2_merged(unsigned wwdd_and_c)
+static void put_iac2_msb_lsb(unsigned x_y)
 {
-        if (G.iaclen + 3 > IACBUFSIZE)
-                iac_flush();
+        put_iac(x_y >> 8);  /* "... & 0xff" is implicit */
+        put_iac(x_y);  /* "... & 0xff" is implicit */
+}
+#define put_iac2_x_y(x,y) put_iac2_msb_lsb(((x)<<8) + (y))
+
+static void put_iac4_msb_lsb(unsigned x_y_z_t)
+{
+        put_iac2_msb_lsb(x_y_z_t >> 16);
+        put_iac2_msb_lsb(x_y_z_t);  /* "... & 0xffff" is implicit */
+}
+#define put_iac4_x_y_z_t(x,y,z,t) put_iac4_msb_lsb(((x)<<24) + ((y)<<16) + ((z)<<8) + (t))
 
+static void put_iac3_IAC_x_y_merged(unsigned wwdd_and_c)
+{
         put_iac(IAC);
-        put_iac(wwdd_and_c >> 8);
-        put_iac(wwdd_and_c & 0xff);
+        put_iac2_msb_lsb(wwdd_and_c);
 }
-#define put_iac2(wwdd,c) put_iac2_merged(((wwdd)<<8) + (c))
+#define put_iac3_IAC_x_y(wwdd,c) put_iac3_IAC_x_y_merged(((wwdd)<<8) + (c))
 
 #if ENABLE_FEATURE_TELNET_TTYPE
 static void put_iac_subopt(byte c, char *str)
 {
-        int len = strlen(str) + 6;   // ( 2 + 1 + 1 + strlen + 2 )
-
-        if (G.iaclen + len > IACBUFSIZE)
-                iac_flush();
-
-        put_iac(IAC);
-        put_iac(SB);
-        put_iac(c);
-        put_iac(0);
+        put_iac4_x_y_z_t(IAC, SB, c, 0);
 
         while (*str)
                 put_iac(*str++);
 
-        put_iac(IAC);
-        put_iac(SE);
+        put_iac2_x_y(IAC, SE);
 }
 #endif
 
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
 static void put_iac_subopt_autologin(void)
 {
-        int len = strlen(G.autologin) + 6;      // (2 + 1 + 1 + strlen + 2)
-        const char *p = "USER";
-
-        if (G.iaclen + len > IACBUFSIZE)
-                iac_flush();
-
-        put_iac(IAC);
-        put_iac(SB);
-        put_iac(TELOPT_NEW_ENVIRON);
-        put_iac(TELQUAL_IS);
-        put_iac(NEW_ENV_VAR);
-
-        while (*p)
-                put_iac(*p++);
+        const char *p;
 
-        put_iac(NEW_ENV_VALUE);
+        put_iac4_x_y_z_t(IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_IS);
+        put_iac4_x_y_z_t(NEW_ENV_VAR, 'U', 'S', 'E'); /* "USER" */
+        put_iac2_x_y('R', NEW_ENV_VALUE);
 
         p = G.autologin;
         while (*p)
                 put_iac(*p++);
 
-        put_iac(IAC);
-        put_iac(SE);
+        put_iac2_x_y(IAC, SE);
 }
 #endif
 
 #if ENABLE_FEATURE_TELNET_WIDTH
 static void put_iac_naws(byte c, int x, int y)
 {
-        if (G.iaclen + 9 > IACBUFSIZE)
-                iac_flush();
+        put_iac3_IAC_x_y(SB, c);
 
-        put_iac(IAC);
-        put_iac(SB);
-        put_iac(c);
+        put_iac4_msb_lsb((x << 16) + y);
 
-        /* "... & 0xff" implicitly done below */
-        put_iac(x >> 8);
-        put_iac(x);
-        put_iac(y >> 8);
-        put_iac(y);
-
-        put_iac(IAC);
-        put_iac(SE);
+        put_iac2_x_y(IAC, SE);
 }
 #endif
 
@@ -445,8 +435,8 @@ static void will_charmode(void)
         G.telflags |= (UF_ECHO | UF_SGA);
         setConMode();
 
-        put_iac2(DO, TELOPT_ECHO);
-        put_iac2(DO, TELOPT_SGA);
+        put_iac3_IAC_x_y(DO, TELOPT_ECHO);
+        put_iac3_IAC_x_y(DO, TELOPT_SGA);
         iac_flush();
 }
 
@@ -456,24 +446,24 @@ static void do_linemode(void)
         G.telflags &= ~(UF_ECHO | UF_SGA);
         setConMode();
 
-        put_iac2(DONT, TELOPT_ECHO);
-        put_iac2(DONT, TELOPT_SGA);
+        put_iac3_IAC_x_y(DONT, TELOPT_ECHO);
+        put_iac3_IAC_x_y(DONT, TELOPT_SGA);
         iac_flush();
 }
 
 static void to_notsup(char c)
 {
         if (G.telwish == WILL)
-                put_iac2(DONT, c);
+                put_iac3_IAC_x_y(DONT, c);
         else if (G.telwish == DO)
-                put_iac2(WONT, c);
+                put_iac3_IAC_x_y(WONT, c);
 }
 
 static void to_echo(void)
 {
         /* if server requests ECHO, don't agree */
         if (G.telwish == DO) {
-                put_iac2(WONT, TELOPT_ECHO);
+                put_iac3_IAC_x_y(WONT, TELOPT_ECHO);
                 return;
         }
         if (G.telwish == DONT)
@@ -489,9 +479,9 @@ static void to_echo(void)
                 G.telflags ^= UF_ECHO;
 
         if (G.telflags & UF_ECHO)
-                put_iac2(DO, TELOPT_ECHO);
+                put_iac3_IAC_x_y(DO, TELOPT_ECHO);
         else
-                put_iac2(DONT, TELOPT_ECHO);
+                put_iac3_IAC_x_y(DONT, TELOPT_ECHO);
 
         setConMode();
         full_write1_str("\r\n");  /* sudden modec */
@@ -509,9 +499,9 @@ static void to_sga(void)
 
         G.telflags ^= UF_SGA; /* toggle */
         if (G.telflags & UF_SGA)
-                put_iac2(DO, TELOPT_SGA);
+                put_iac3_IAC_x_y(DO, TELOPT_SGA);
         else
-                put_iac2(DONT, TELOPT_SGA);
+                put_iac3_IAC_x_y(DONT, TELOPT_SGA);
 }
 
 #if ENABLE_FEATURE_TELNET_TTYPE
@@ -519,9 +509,9 @@ static void to_ttype(void)
 {
         /* Tell server we will (or won't) do TTYPE */
         if (G.ttype)
-                put_iac2(WILL, TELOPT_TTYPE);
+                put_iac3_IAC_x_y(WILL, TELOPT_TTYPE);
         else
-                put_iac2(WONT, TELOPT_TTYPE);
+                put_iac3_IAC_x_y(WONT, TELOPT_TTYPE);
 }
 #endif
 
@@ -530,9 +520,9 @@ static void to_new_environ(void)
 {
         /* Tell server we will (or will not) do AUTOLOGIN */
         if (G.autologin)
-                put_iac2(WILL, TELOPT_NEW_ENVIRON);
+                put_iac3_IAC_x_y(WILL, TELOPT_NEW_ENVIRON);
         else
-                put_iac2(WONT, TELOPT_NEW_ENVIRON);
+                put_iac3_IAC_x_y(WONT, TELOPT_NEW_ENVIRON);
 }
 #endif
 
@@ -540,7 +530,7 @@ static void to_new_environ(void)
 static void to_naws(void)
 {
         /* Tell server we will do NAWS */
-        put_iac2(WILL, TELOPT_NAWS);
+        put_iac3_IAC_x_y(WILL, TELOPT_NAWS);
 }
 #endif
 
@@ -649,6 +639,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 
         xmove_fd(create_and_connect_stream_or_die(host, port), netfd);
+        printf("Connected to %s\n", host);
 
         setsockopt_keepalive(netfd);
 
diff --git a/networking/telnetd.c b/networking/telnetd.c
index a6bafa21d..caef15181 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -865,11 +865,25 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
  skip3:
                 if (/*ts->size2 < BUFSIZE &&*/ FD_ISSET(ts->ptyfd, &rdfdset)) {
                         /* Read from pty to buffer 2 */
+                        int eio = 0;
+ read_pty:
                         count = MIN(BUFSIZE - ts->rdidx2, BUFSIZE - ts->size2);
                         count = safe_read(ts->ptyfd, TS_BUF2(ts) + ts->rdidx2, count);
                         if (count <= 0) {
-                                if (count < 0 && errno == EAGAIN)
-                                        goto skip4;
+                                if (count < 0) {
+                                        if (errno == EAGAIN)
+                                                goto skip4;
+                                        /* login process might call vhangup(),
+                                         * which causes intermittent EIOs on read above
+                                         * (observed on kernel 4.12.0). Try up to 10 ms.
+                                         */
+                                        if (errno == EIO && eio < 10) {
+                                                eio++;
+                                                //bb_error_msg("EIO pty %u", eio);
+                                                usleep(1000);
+                                                goto read_pty;
+                                        }
+                                }
                                 goto kill_session;
                         }
                         ts->size2 += count;
diff --git a/networking/tftp.c b/networking/tftp.c
index 4cd39186a..d20d4ca4b 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -19,7 +19,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TFTP
-//config:       bool "tftp (12 kb)"
+//config:       bool "tftp (11 kb)"
 //config:       default y
 //config:       help
 //config:       Trivial File Transfer Protocol client. TFTP is usually used
@@ -41,9 +41,6 @@
 //config:       In other words: it should be run from inetd in nowait mode,
 //config:       or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
 //config:
-//config:comment "Common options for tftp/tftpd"
-//config:       depends on TFTP || TFTPD
-//config:
 //config:config FEATURE_TFTP_GET
 //config:       bool "Enable 'tftp get' and/or tftpd upload code"
 //config:       default y
diff --git a/networking/tls.c b/networking/tls.c
index 38eb79798..d2385efe8 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -6,6 +6,8 @@
 //config:config TLS
 //config:       bool #No description makes it a hidden option
 //config:       default n
+//Note:
+//Config.src also defines FEATURE_TLS_SHA1 option
 
 //kbuild:lib-$(CONFIG_TLS) += tls.o
 //kbuild:lib-$(CONFIG_TLS) += tls_pstm.o
@@ -400,7 +402,7 @@ static void hash_handshake(tls_state_t *tls, const char *fmt, const void *buffer
                 dump_hex(fmt, buffer, len);
                 dbg(" (%u bytes) ", (int)len);
                 len = sha_peek(&tls->hsd->handshake_hash_ctx, h);
-                if (len == SHA1_OUTSIZE)
+                if (ENABLE_FEATURE_TLS_SHA1 && len == SHA1_OUTSIZE)
                         dump_hex("sha1:%s\n", h, len);
                 else
                 if (len == SHA256_OUTSIZE)
@@ -411,6 +413,12 @@ static void hash_handshake(tls_state_t *tls, const char *fmt, const void *buffer
 #endif
 }
 
+#if !ENABLE_FEATURE_TLS_SHA1
+# define TLS_MAC_SIZE(tls) SHA256_OUTSIZE
+#else
+# define TLS_MAC_SIZE(tls) (tls)->MAC_size
+#endif
+
 // RFC 2104:
 // HMAC(key, text) based on a hash H (say, sha256) is:
 // ipad = [0x36 x INSIZE]
@@ -427,6 +435,11 @@ typedef struct hmac_precomputed {
 } hmac_precomputed_t;
 
 typedef void md5sha_begin_func(md5sha_ctx_t *ctx) FAST_FUNC;
+#if !ENABLE_FEATURE_TLS_SHA1
+#define hmac_begin(pre,key,key_size,begin) \
+        hmac_begin(pre,key,key_size)
+#define begin sha256_begin
+#endif
 static void hmac_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size, md5sha_begin_func *begin)
 {
         uint8_t key_xor_ipad[SHA_INSIZE];
@@ -467,6 +480,7 @@ static void hmac_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size,
         md5sha_hash(&pre->hashed_key_xor_ipad, key_xor_ipad, SHA_INSIZE);
         md5sha_hash(&pre->hashed_key_xor_opad, key_xor_opad, SHA_INSIZE);
 }
+#undef begin
 
 static unsigned hmac_sha_precomputed_v(
                 hmac_precomputed_t *pre,
@@ -504,6 +518,10 @@ static unsigned hmac_sha_precomputed(hmac_precomputed_t *pre_init, uint8_t *out,
         return len;
 }
 
+#if !ENABLE_FEATURE_TLS_SHA1
+#define hmac(tls,out,key,key_size,...) \
+        hmac(out,key,key_size, __VA_ARGS__)
+#endif
 static unsigned hmac(tls_state_t *tls, uint8_t *out, uint8_t *key, unsigned key_size, ...)
 {
         hmac_precomputed_t pre;
@@ -513,9 +531,9 @@ static unsigned hmac(tls_state_t *tls, uint8_t *out, uint8_t *key, unsigned key_
         va_start(va, key_size);
 
         hmac_begin(&pre, key, key_size,
-                        (tls->MAC_size == SHA256_OUTSIZE)
-                                ? sha256_begin
-                                : sha1_begin
+                        (ENABLE_FEATURE_TLS_SHA1 && tls->MAC_size == SHA1_OUTSIZE)
+                                ? sha1_begin
+                                : sha256_begin
         );
         len = hmac_sha_precomputed_v(&pre, out, va);
 
@@ -685,7 +703,7 @@ static void xwrite_encrypted_and_hmac_signed(tls_state_t *tls, unsigned size, un
 
         /* Calculate MAC signature */
         hmac(tls, buf + size, /* result */
-                tls->client_write_MAC_key, tls->MAC_size,
+                tls->client_write_MAC_key, TLS_MAC_SIZE(tls),
                 &tls->write_seq64_be, sizeof(tls->write_seq64_be),
                 xhdr, RECHDR_LEN,
                 buf, size,
@@ -693,7 +711,7 @@ static void xwrite_encrypted_and_hmac_signed(tls_state_t *tls, unsigned size, un
         );
         tls->write_seq64_be = SWAP_BE64(1 + SWAP_BE64(tls->write_seq64_be));
 
-        size += tls->MAC_size;
+        size += TLS_MAC_SIZE(tls);
 
         // RFC 5246:
         // 6.2.3.1.  Null or Standard Stream Cipher
@@ -778,7 +796,7 @@ static void xwrite_encrypted_and_hmac_signed(tls_state_t *tls, unsigned size, un
 
         tls_get_random(buf - AES_BLOCK_SIZE, AES_BLOCK_SIZE); /* IV */
         dbg("before crypt: 5 hdr + %u data + %u hash bytes\n",
-                        size - tls->MAC_size, tls->MAC_size);
+                        size - TLS_MAC_SIZE(tls), TLS_MAC_SIZE(tls));
 
         /* Fill IV and padding in outbuf */
         // RFC is talking nonsense:
@@ -1093,7 +1111,7 @@ static int tls_xread_record(tls_state_t *tls, const char *expected)
                         tls_aesgcm_decrypt(tls, p, sz);
                         dbg("encrypted size:%u\n", sz);
                 } else
-                if (tls->min_encrypted_len_on_read > tls->MAC_size) {
+                if (tls->min_encrypted_len_on_read > TLS_MAC_SIZE(tls)) {
                         /* AES+SHA */
                         uint8_t *p = tls->inbuf + RECHDR_LEN;
                         int padding_len;
@@ -1112,7 +1130,7 @@ static int tls_xread_record(tls_state_t *tls, const char *expected)
                         padding_len = p[sz - 1];
                         dbg("encrypted size:%u type:0x%02x padding_length:0x%02x\n", sz, p[0], padding_len);
                         padding_len++;
-                        sz -= tls->MAC_size + padding_len; /* drop MAC and padding */
+                        sz -= TLS_MAC_SIZE(tls) + padding_len; /* drop MAC and padding */
                 } else {
                         /* if nonzero, then it's TLS_RSA_WITH_NULL_SHA256: drop MAC */
                         /* else: no encryption yet on input, subtract zero = NOP */
@@ -1472,15 +1490,19 @@ static ALWAYS_INLINE void fill_handshake_record_hdr(void *buf, unsigned type, un
 
 static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
 {
-#define NUM_CIPHERS (13 + ALLOW_RSA_NULL_SHA256)
+#define NUM_CIPHERS (7 + 6 * ENABLE_FEATURE_TLS_SHA1 + ALLOW_RSA_NULL_SHA256)
         static const uint8_t ciphers[] = {
-                0x00,(1 + NUM_CIPHERS) * 2, //len16_be
+                0x00,2 + NUM_CIPHERS*2, //len16_be
                 0x00,0xFF, //not a cipher - TLS_EMPTY_RENEGOTIATION_INFO_SCSV
                 /* ^^^^^^ RFC 5746 Renegotiation Indication Extension - some servers will refuse to work with us otherwise */
+#if ENABLE_FEATURE_TLS_SHA1
                 0xC0,0x09, // 1 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA - ok: wget https://is.gd/
                 0xC0,0x0A, // 2 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA - ok: wget https://is.gd/
                 0xC0,0x13, // 3 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-SHA
                 0xC0,0x14, // 4 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - ok: openssl s_server ... -cipher ECDHE-RSA-AES256-SHA (might fail with older openssl)
+        //      0xC0,0x18, //   TLS_ECDH_anon_WITH_AES_128_CBC_SHA
+        //      0xC0,0x19, //   TLS_ECDH_anon_WITH_AES_256_CBC_SHA
+#endif
                 0xC0,0x23, // 5 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 - ok: wget https://is.gd/
         //      0xC0,0x24, //   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 - can't do SHA384 yet
                 0xC0,0x27, // 6 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-SHA256
@@ -1491,12 +1513,16 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
                 0xC0,0x2F, // 8 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-GCM-SHA256
         //      0xC0,0x30, //   TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - openssl s_server ... -cipher ECDHE-RSA-AES256-GCM-SHA384: "decryption failed or bad record mac"
         //possibly these too:
+#if ENABLE_FEATURE_TLS_SHA1
         //      0xC0,0x35, //   TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
         //      0xC0,0x36, //   TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+#endif
         //      0xC0,0x37, //   TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
         //      0xC0,0x38, //   TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 - can't do SHA384 yet
+#if ENABLE_FEATURE_TLS_SHA1
                 0x00,0x2F, // 9 TLS_RSA_WITH_AES_128_CBC_SHA - ok: openssl s_server ... -cipher AES128-SHA
                 0x00,0x35, //10 TLS_RSA_WITH_AES_256_CBC_SHA - ok: openssl s_server ... -cipher AES256-SHA
+#endif
                 0x00,0x3C, //11 TLS_RSA_WITH_AES_128_CBC_SHA256 - ok: openssl s_server ... -cipher AES128-SHA256
                 0x00,0x3D, //12 TLS_RSA_WITH_AES_256_CBC_SHA256 - ok: openssl s_server ... -cipher AES256-SHA256
                 0x00,0x9C, //13 TLS_RSA_WITH_AES_128_GCM_SHA256 - ok: openssl s_server ... -cipher AES128-GCM-SHA256
@@ -1511,9 +1537,17 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
                 0x00,0x04, //ext len
                 0x00,0x02, //list len
                 0x00,0x1d, //curve_x25519 (RFC 7748)
+                //0x00,0x1e, //curve_x448 (RFC 7748)
                 //0x00,0x17, //curve_secp256r1
                 //0x00,0x18, //curve_secp384r1
                 //0x00,0x19, //curve_secp521r1
+//TODO: implement secp256r1 (at least): dl.fedoraproject.org immediately aborts
+//if only x25519/x448 are advertised, seems to support only secpNNNr1 curves:
+// openssl s_client -connect dl.fedoraproject.org:443 -debug -tls1_2 -cipher ECDHE-RSA-AES128-GCM-SHA256
+//Peer signing digest: SHA512
+//Peer signature type: RSA
+//Server Temp Key: ECDH, P-256, 256 bits
+//TLSv1.2, Cipher is ECDHE-RSA-AES128-GCM-SHA256
         };
         //static const uint8_t signature_algorithms[] = {
         //      000d
@@ -1530,7 +1564,7 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
                 uint8_t session_id_len;
                 /* uint8_t session_id[]; */
                 uint8_t cipherid_len16_hi, cipherid_len16_lo;
-                uint8_t cipherid[(1 + NUM_CIPHERS) * 2]; /* actually variable */
+                uint8_t cipherid[2 + NUM_CIPHERS*2]; /* actually variable */
                 uint8_t comprtypes_len;
                 uint8_t comprtypes[1]; /* actually variable */
                 /* Extensions (SNI shown):
@@ -1578,7 +1612,7 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
                 memset(record->rand32, 0x11, sizeof(record->rand32));
         /* record->session_id_len = 0; - already is */
 
-        BUILD_BUG_ON(sizeof(ciphers) != 2 + (1 + NUM_CIPHERS) * 2 + 2);
+        BUILD_BUG_ON(sizeof(ciphers) != 2 + 2 + NUM_CIPHERS*2 + 2);
         memcpy(&record->cipherid_len16_hi, ciphers, sizeof(ciphers));
 
         ptr = (void*)(record + 1);
@@ -1675,31 +1709,42 @@ static void get_server_hello(tls_state_t *tls)
 
         /* Set up encryption params based on selected cipher */
 #if 0
+#if ENABLE_FEATURE_TLS_SHA1
                 0xC0,0x09, // 1 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA - ok: wget https://is.gd/
                 0xC0,0x0A, // 2 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA - ok: wget https://is.gd/
                 0xC0,0x13, // 3 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-SHA
                 0xC0,0x14, // 4 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - ok: openssl s_server ... -cipher ECDHE-RSA-AES256-SHA (might fail with older openssl)
+        //      0xC0,0x18, //   TLS_ECDH_anon_WITH_AES_128_CBC_SHA
+        //      0xC0,0x19, //   TLS_ECDH_anon_WITH_AES_256_CBC_SHA
+#endif
                 0xC0,0x23, // 5 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 - ok: wget https://is.gd/
         //      0xC0,0x24, //   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 - can't do SHA384 yet
                 0xC0,0x27, // 6 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-SHA256
         //      0xC0,0x28, //   TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 - can't do SHA384 yet
                 0xC0,0x2B, // 7 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - ok: wget https://is.gd/
         //      0xC0,0x2C, //   TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 - wget https://is.gd/: "TLS error from peer (alert code 20): bad MAC"
+//TODO: GCM_SHA384 ciphers can be supported, only need sha384-based PRF?
                 0xC0,0x2F, // 8 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - ok: openssl s_server ... -cipher ECDHE-RSA-AES128-GCM-SHA256
         //      0xC0,0x30, //   TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - openssl s_server ... -cipher ECDHE-RSA-AES256-GCM-SHA384: "decryption failed or bad record mac"
         //possibly these too:
+#if ENABLE_FEATURE_TLS_SHA1
         //      0xC0,0x35, //   TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
         //      0xC0,0x36, //   TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+#endif
         //      0xC0,0x37, //   TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
         //      0xC0,0x38, //   TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 - can't do SHA384 yet
+#if ENABLE_FEATURE_TLS_SHA1
                 0x00,0x2F, // 9 TLS_RSA_WITH_AES_128_CBC_SHA - ok: openssl s_server ... -cipher AES128-SHA
                 0x00,0x35, //10 TLS_RSA_WITH_AES_256_CBC_SHA - ok: openssl s_server ... -cipher AES256-SHA
+#endif
                 0x00,0x3C, //11 TLS_RSA_WITH_AES_128_CBC_SHA256 - ok: openssl s_server ... -cipher AES128-SHA256
                 0x00,0x3D, //12 TLS_RSA_WITH_AES_256_CBC_SHA256 - ok: openssl s_server ... -cipher AES256-SHA256
                 0x00,0x9C, //13 TLS_RSA_WITH_AES_128_GCM_SHA256 - ok: openssl s_server ... -cipher AES128-GCM-SHA256
         //      0x00,0x9D, //   TLS_RSA_WITH_AES_256_GCM_SHA384 - openssl s_server ... -cipher AES256-GCM-SHA384: "decryption failed or bad record mac"
+#if ALLOW_RSA_NULL_SHA256
                 0x00,0x3B, //   TLS_RSA_WITH_NULL_SHA256
 #endif
+#endif
         cipherid1 = cipherid[1];
         tls->cipher_id = 0x100 * cipherid[0] + cipherid1;
         tls->key_size = AES256_KEYSIZE;
@@ -1712,7 +1757,7 @@ static void get_server_hello(tls_state_t *tls)
                         /* Odd numbered C0xx use AES128 (even ones use AES256) */
                         tls->key_size = AES128_KEYSIZE;
                 }
-                if (cipherid1 <= 0x14) {
+                if (ENABLE_FEATURE_TLS_SHA1 && cipherid1 <= 0x19) {
                         tls->MAC_size = SHA1_OUTSIZE;
                 } else
                 if (cipherid1 >= 0x2B && cipherid1 <= 0x30) {
@@ -1723,13 +1768,13 @@ static void get_server_hello(tls_state_t *tls)
                 }
         } else {
                 /* All 00xx are RSA */
-                if (cipherid1 == 0x2F
+                if ((ENABLE_FEATURE_TLS_SHA1 && cipherid1 == 0x2F)
                  || cipherid1 == 0x3C
                  || cipherid1 == 0x9C
                 ) {
                         tls->key_size = AES128_KEYSIZE;
                 }
-                if (cipherid1 <= 0x35) {
+                if (ENABLE_FEATURE_TLS_SHA1 && cipherid1 <= 0x35) {
                         tls->MAC_size = SHA1_OUTSIZE;
                 } else
                 if (cipherid1 == 0x9C /*|| cipherid1 == 0x9D*/) {
@@ -2227,7 +2272,7 @@ void FAST_FUNC tls_handshake(tls_state_t *tls, const char *sni)
                 tls->min_encrypted_len_on_read = tls->MAC_size;
         } else
         if (!(tls->flags & ENCRYPTION_AESGCM)) {
-                unsigned mac_blocks = (unsigned)(tls->MAC_size + AES_BLOCK_SIZE-1) / AES_BLOCK_SIZE;
+                unsigned mac_blocks = (unsigned)(TLS_MAC_SIZE(tls) + AES_BLOCK_SIZE-1) / AES_BLOCK_SIZE;
                 /* all incoming packets now should be encrypted and have
                  * at least IV + (MAC padded to blocksize):
                  */
diff --git a/networking/tls_aesgcm.c b/networking/tls_aesgcm.c
index 688df85fb..a4663cd79 100644
--- a/networking/tls_aesgcm.c
+++ b/networking/tls_aesgcm.c
@@ -35,38 +35,87 @@ static ALWAYS_INLINE void FlattenSzInBits(byte* buf, word32 sz)
 
 static void RIGHTSHIFTX(byte* x)
 {
-    int i;
-    int carryOut = 0;
-    int carryIn = 0;
-    int borrow = x[15] & 0x01;
+#define l ((unsigned long*)x)
+#if 0
 
+    // Generic byte-at-a-time algorithm
+    int i;
+    byte carryIn = (x[15] & 0x01) ? 0xE1 : 0;
     for (i = 0; i < AES_BLOCK_SIZE; i++) {
-        carryOut = x[i] & 0x01;
-        x[i] = (x[i] >> 1) | (carryIn ? 0x80 : 0);
+        byte carryOut = (x[i] << 7); // zero, or 0x80
+        x[i] = (x[i] >> 1) ^ carryIn;
+        carryIn = carryOut;
+    }
+
+#elif BB_BIG_ENDIAN
+
+    // Big-endian can shift-right in larger than byte chunks
+    // (we use the fact that 'x' is long-aligned)
+    unsigned long carryIn = (x[15] & 0x01)
+        ? ((unsigned long)0xE1 << (LONG_BIT-8))
+        : 0;
+# if ULONG_MAX <= 0xffffffff
+    int i;
+    for (i = 0; i < AES_BLOCK_SIZE/sizeof(long); i++) {
+        unsigned long carryOut = l[i] << (LONG_BIT-1); // zero, or 0x800..00
+        l[i] = (l[i] >> 1) ^ carryIn;
         carryIn = carryOut;
     }
-    if (borrow) x[0] ^= 0xE1;
+# else
+    // 64-bit code: need to process only 2 words
+    unsigned long carryOut = l[0] << (LONG_BIT-1); // zero, or 0x800..00
+    l[0] = (l[0] >> 1) ^ carryIn;
+    l[1] = (l[1] >> 1) ^ carryOut;
+# endif
+
+#else /* LITTLE_ENDIAN */
+
+    // In order to use word-sized ops, little-endian needs to byteswap.
+    // On x86, code size increase is ~10 bytes compared to byte-by-byte.
+    unsigned long carryIn = (x[15] & 0x01)
+        ? ((unsigned long)0xE1 << (LONG_BIT-8))
+        : 0;
+# if ULONG_MAX <= 0xffffffff
+    int i;
+    for (i = 0; i < AES_BLOCK_SIZE/sizeof(long); i++) {
+        unsigned long ti = SWAP_BE32(l[i]);
+        unsigned long carryOut = ti << (LONG_BIT-1); // zero, or 0x800..00
+        ti = (ti >> 1) ^ carryIn;
+        l[i] = SWAP_BE32(ti);
+        carryIn = carryOut;
+    }
+# else
+    // 64-bit code: need to process only 2 words
+    unsigned long tt = SWAP_BE64(l[0]);
+    unsigned long carryOut = tt << (LONG_BIT-1); // zero, or 0x800..00
+    tt = (tt >> 1) ^ carryIn; l[0] = SWAP_BE64(tt);
+    tt = SWAP_BE64(l[1]);
+    tt = (tt >> 1) ^ carryOut; l[1] = SWAP_BE64(tt);
+# endif
+
+#endif /* LITTLE_ENDIAN */
+#undef l
 }
 
+// Caller guarantees X is aligned
 static void GMULT(byte* X, byte* Y)
 {
     byte Z[AES_BLOCK_SIZE] ALIGNED_long;
-    byte V[AES_BLOCK_SIZE] ALIGNED_long;
-    int i, j;
+    //byte V[AES_BLOCK_SIZE] ALIGNED_long;
+    int i;
 
     XMEMSET(Z, 0, AES_BLOCK_SIZE);
-    XMEMCPY(V, X, AES_BLOCK_SIZE);
-    for (i = 0; i < AES_BLOCK_SIZE; i++)
-    {
-        byte y = Y[i];
-        for (j = 0; j < 8; j++)
-        {
+    //XMEMCPY(V, X, AES_BLOCK_SIZE);
+    for (i = 0; i < AES_BLOCK_SIZE; i++) {
+        uint32_t y = 0x800000 | Y[i];
+        for (;;) { // for every bit in Y[i], from msb to lsb
             if (y & 0x80) {
-                xorbuf_aligned_AES_BLOCK_SIZE(Z, V);
+                xorbuf_aligned_AES_BLOCK_SIZE(Z, X); // was V, not X
             }
-
-            RIGHTSHIFTX(V);
+            RIGHTSHIFTX(X); // was V, not X
             y = y << 1;
+            if ((int32_t)y < 0) // if bit 0x80000000 set = if 8 iterations done
+                break;
         }
     }
     XMEMCPY(X, Z, AES_BLOCK_SIZE);
diff --git a/networking/tls_pstm.c b/networking/tls_pstm.c
index e12e6c9d4..e5544ab11 100644
--- a/networking/tls_pstm.c
+++ b/networking/tls_pstm.c
@@ -47,13 +47,18 @@
 //#include "../cryptoApi.h"
 #ifndef DISABLE_PSTM
 
+#undef pstm_mul_2d
 static int32 pstm_mul_2d(pstm_int *a, int b, pstm_int *c); //bbox: was int16 b
+#define pstm_mul_2d(a, b, c) (pstm_mul_2d(a, b, c), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         init an pstm_int for a given size
  */
-int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size)
+#undef pstm_init_size
+#define pstm_init_size(pool, a, size) \
+        pstm_init_size(      a, size)
+int32 FAST_FUNC pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size)
 {
 //bbox
 //      uint16          x;
@@ -75,12 +80,17 @@ int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size)
 //      }
         return PSTM_OKAY;
 }
+#undef pstm_init_size
+#define pstm_init_size(pool, a, size) (pstm_init_size(a, size), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         Init a new pstm_int.
 */
-int32 pstm_init(psPool_t *pool, pstm_int * a)
+#undef pstm_init
+#define pstm_init(pool, a) \
+        pstm_init(      a)
+static int32 pstm_init(psPool_t *pool, pstm_int * a)
 {
 //bbox
 //      int32           i;
@@ -106,12 +116,15 @@ int32 pstm_init(psPool_t *pool, pstm_int * a)
 
         return PSTM_OKAY;
 }
+#undef pstm_init
+#define pstm_init(pool, a) (pstm_init(a), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         Grow as required
  */
-int32 pstm_grow(pstm_int * a, int size)
+#undef pstm_grow
+int32 FAST_FUNC pstm_grow(pstm_int * a, int size)
 {
         int                     i; //bbox: was int16
         pstm_digit              *tmp;
@@ -142,11 +155,13 @@ int32 pstm_grow(pstm_int * a, int size)
         }
         return PSTM_OKAY;
 }
+#define pstm_grow(a, size) (pstm_grow(a, size), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         copy, b = a (b must be pre-allocated)
  */
+#undef pstm_copy
 int32 pstm_copy(pstm_int * a, pstm_int * b)
 {
         int32   res, n;
@@ -195,6 +210,7 @@ int32 pstm_copy(pstm_int * a, pstm_int * b)
         b->sign = a->sign;
         return PSTM_OKAY;
 }
+#define pstm_copy(a, b) (pstm_copy(a, b), PSTM_OKAY)
 
 /******************************************************************************/
 /*
@@ -204,7 +220,7 @@ int32 pstm_copy(pstm_int * a, pstm_int * b)
         leading "used" digit will be non-zero. Typically very fast.  Also fixes
         the sign if there are no more leading digits
 */
-void pstm_clamp(pstm_int * a)
+void FAST_FUNC pstm_clamp(pstm_int * a)
 {
 /*      decrease used while the most significant digit is zero. */
         while (a->used > 0 && a->dp[a->used - 1] == 0) {
@@ -220,7 +236,7 @@ void pstm_clamp(pstm_int * a)
 /*
         clear one (frees).
  */
-void pstm_clear(pstm_int * a)
+void FAST_FUNC pstm_clear(pstm_int * a)
 {
         int32           i;
 /*
@@ -248,6 +264,7 @@ void pstm_clear(pstm_int * a)
 /*
         clear many (frees).
  */
+#if 0 //UNUSED
 void pstm_clear_multi(pstm_int *mp0, pstm_int *mp1, pstm_int *mp2,
                                         pstm_int *mp3, pstm_int *mp4, pstm_int *mp5,
                                         pstm_int *mp6, pstm_int *mp7)
@@ -272,12 +289,13 @@ void pstm_clear_multi(pstm_int *mp0, pstm_int *mp1, pstm_int *mp2,
                 }
         }
 }
+#endif
 
 /******************************************************************************/
 /*
         Set to zero.
  */
-void pstm_zero(pstm_int * a)
+static void pstm_zero(pstm_int * a)
 {
         int32           n;
         pstm_digit      *tmp;
@@ -296,7 +314,7 @@ void pstm_zero(pstm_int * a)
 /*
         Compare maginitude of two ints (unsigned).
  */
-int32 pstm_cmp_mag(pstm_int * a, pstm_int * b)
+int32 FAST_FUNC pstm_cmp_mag(pstm_int * a, pstm_int * b)
 {
         int             n; //bbox: was int16
         pstm_digit      *tmpa, *tmpb;
@@ -336,7 +354,7 @@ int32 pstm_cmp_mag(pstm_int * a, pstm_int * b)
 /*
         Compare two ints (signed)
  */
-int32 pstm_cmp(pstm_int * a, pstm_int * b)
+int32 FAST_FUNC pstm_cmp(pstm_int * a, pstm_int * b)
 {
 /*
         compare based on sign
@@ -364,7 +382,7 @@ int32 pstm_cmp(pstm_int * a, pstm_int * b)
         pstm_ints can be initialized more precisely when they will populated
         using pstm_read_unsigned_bin since the length of the byte stream is known
 */
-int32 pstm_init_for_read_unsigned_bin(psPool_t *pool, pstm_int *a, uint32 len)
+int32 FAST_FUNC pstm_init_for_read_unsigned_bin(psPool_t *pool, pstm_int *a, uint32 len)
 {
         int32 size;
 /*
@@ -385,7 +403,7 @@ int32 pstm_init_for_read_unsigned_bin(psPool_t *pool, pstm_int *a, uint32 len)
         called pstm_init_for_read_unsigned_bin first.  There is some grow logic
         here if the default pstm_init was used but we don't really want to hit it.
 */
-int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c)
+int32 FAST_FUNC pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c)
 {
         /* zero the int */
         pstm_zero (a);
@@ -460,7 +478,7 @@ int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c)
 /******************************************************************************/
 /*
 */
-int pstm_count_bits (pstm_int * a)
+static int pstm_count_bits(pstm_int * a)
 {
         int     r; //bbox: was int16
         pstm_digit q;
@@ -482,14 +500,14 @@ int pstm_count_bits (pstm_int * a)
 }
 
 /******************************************************************************/
-int32 pstm_unsigned_bin_size(pstm_int *a)
+int32 FAST_FUNC pstm_unsigned_bin_size(pstm_int *a)
 {
         int32     size = pstm_count_bits (a);
         return (size / 8 + ((size & 7) != 0 ? 1 : 0));
 }
 
 /******************************************************************************/
-void pstm_set(pstm_int *a, pstm_digit b)
+static void pstm_set(pstm_int *a, pstm_digit b)
 {
    pstm_zero(a);
    a->dp[0] = b;
@@ -500,7 +518,7 @@ void pstm_set(pstm_int *a, pstm_digit b)
 /*
         Right shift
 */
-void pstm_rshd(pstm_int *a, int x)
+static void pstm_rshd(pstm_int *a, int x)
 {
         int y; //bbox: was int16
 
@@ -529,7 +547,8 @@ void pstm_rshd(pstm_int *a, int x)
 /*
         Shift left a certain amount of digits.
  */
-int32 pstm_lshd(pstm_int * a, int b)
+#undef pstm_lshd
+static int32 pstm_lshd(pstm_int * a, int b)
 {
         int     x; //bbox: was int16
         int32   res;
@@ -577,12 +596,13 @@ int32 pstm_lshd(pstm_int * a, int b)
         }
         return PSTM_OKAY;
 }
+#define pstm_lshd(a, b) (pstm_lshd(a, b), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         computes a = 2**b
 */
-int32 pstm_2expt(pstm_int *a, int b)
+static int32 pstm_2expt(pstm_int *a, int b)
 {
         int     z; //bbox: was int16
 
@@ -616,7 +636,7 @@ int32 pstm_2expt(pstm_int *a, int b)
 /*
 
 */
-int32 pstm_mul_2(pstm_int * a, pstm_int * b)
+int32 FAST_FUNC pstm_mul_2(pstm_int * a, pstm_int * b)
 {
         int32   res;
         int     x, oldused; //bbox: was int16
@@ -682,7 +702,7 @@ int32 pstm_mul_2(pstm_int * a, pstm_int * b)
 /*
         unsigned subtraction ||a|| >= ||b|| ALWAYS!
 */
-int32 s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
+int32 FAST_FUNC s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 {
         int             oldbused, oldused; //bbox: was int16
         int32           x;
@@ -779,7 +799,7 @@ static int32 s_pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 /*
 
 */
-int32 pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
+int32 FAST_FUNC pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 {
         int32   res;
         int     sa, sb; //bbox: was int16
@@ -824,6 +844,7 @@ int32 pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c)
 /*
         c = a - b
 */
+#if 0 //UNUSED
 int32 pstm_sub_d(psPool_t *pool, pstm_int *a, pstm_digit b, pstm_int *c)
 {
         pstm_int        tmp;
@@ -837,12 +858,13 @@ int32 pstm_sub_d(psPool_t *pool, pstm_int *a, pstm_digit b, pstm_int *c)
         pstm_clear(&tmp);
         return res;
 }
+#endif
 
 /******************************************************************************/
 /*
         setups the montgomery reduction
 */
-int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho)
+static int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho)
 {
         pstm_digit x, b;
 
@@ -878,7 +900,7 @@ int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho)
  *      computes a = B**n mod b without division or multiplication useful for
  *      normalizing numbers in a Montgomery system.
  */
-int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b)
+static int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b)
 {
         int32     x;
         int     bits; //bbox: was int16
@@ -916,6 +938,7 @@ int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b)
 /*
         c = a * 2**d
 */
+#undef pstm_mul_2d
 static int32 pstm_mul_2d(pstm_int *a, int b, pstm_int *c)
 {
         pstm_digit      carry, carrytmp, shift;
@@ -956,11 +979,13 @@ static int32 pstm_mul_2d(pstm_int *a, int b, pstm_int *c)
         pstm_clamp(c);
         return PSTM_OKAY;
 }
+#define pstm_mul_2d(a, b, c) (pstm_mul_2d(a, b, c), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         c = a mod 2**d
 */
+#undef pstm_mod_2d
 static int32 pstm_mod_2d(pstm_int *a, int b, pstm_int *c) //bbox: was int16 b
 {
         int     x; //bbox: was int16
@@ -991,13 +1016,15 @@ static int32 pstm_mod_2d(pstm_int *a, int b, pstm_int *c) //bbox: was int16 b
         pstm_clamp (c);
         return PSTM_OKAY;
 }
+#define pstm_mod_2d(a, b, c) (pstm_mod_2d(a, b, c), PSTM_OKAY)
 
 
 /******************************************************************************/
 /*
         c = a * b
 */
-int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c)
+#undef pstm_mul_d
+static int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c)
 {
         pstm_word       w;
         int32           res;
@@ -1027,12 +1054,16 @@ int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c)
         pstm_clamp(c);
         return PSTM_OKAY;
 }
+#define pstm_mul_d(a, b, c) (pstm_mul_d(a, b, c), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         c = a / 2**b
 */
-int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
+#undef pstm_div_2d
+#define pstm_div_2d(pool, a, b, c, d) \
+        pstm_div_2d(      a, b, c, d)
+static int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
                                         pstm_int *d)
 {
         pstm_digit      D, r, rr;
@@ -1113,11 +1144,14 @@ LBL_DONE:
         }
         return res;
 }
+#undef pstm_div_2d
+#define pstm_div_2d(pool, a, b, c, d) (pstm_div_2d(a, b, c, d), PSTM_OKAY)
 
 /******************************************************************************/
 /*
         b = a/2
 */
+#if 0 //UNUSED
 int32 pstm_div_2(pstm_int * a, pstm_int * b)
 {
         int     x, oldused; //bbox: was int16
@@ -1161,12 +1195,16 @@ int32 pstm_div_2(pstm_int * a, pstm_int * b)
         pstm_clamp (b);
         return PSTM_OKAY;
 }
+#endif
 
 /******************************************************************************/
 /*
         Creates "a" then copies b into it
  */
-int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b, int toSqr)
+#undef pstm_init_copy
+#define pstm_init_copy(pool, a, b, toSqr) \
+        pstm_init_copy(      a, b, toSqr)
+static int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b, int toSqr)
 {
         int     x; //bbox: was int16
         int32   res;
@@ -1191,6 +1229,8 @@ int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b, int toSqr)
         }
         return pstm_copy(b, a);
 }
+#undef pstm_init_copy
+#define pstm_init_copy(pool, a, b, toSqr) (pstm_init_copy(a, b, toSqr), PSTM_OKAY)
 
 /******************************************************************************/
 /*
@@ -1274,7 +1314,7 @@ static uint64 psDiv128(uint128 *numerator, uint64 denominator)
 /*
         a/b => cb + d == a
 */
-int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
+static int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
                                 pstm_int *d)
 {
         pstm_int        q, x, y, t1, t2;
@@ -1487,7 +1527,7 @@ LBL_T1:pstm_clear (&t1);
         Swap the elements of two integers, for cases where you can't simply swap
         the pstm_int pointers around
 */
-void pstm_exch(pstm_int * a, pstm_int * b)
+static void pstm_exch(pstm_int * a, pstm_int * b)
 {
         pstm_int                t;
 
@@ -1500,7 +1540,7 @@ void pstm_exch(pstm_int * a, pstm_int * b)
 /*
         c = a mod b, 0 <= c < b
 */
-int32 pstm_mod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c)
+static int32 pstm_mod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c)
 {
         pstm_int        t;
         int32           err;
@@ -1527,7 +1567,7 @@ int32 pstm_mod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c)
 /*
         d = a * b (mod c)
 */
-int32 pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
+int32 FAST_FUNC pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
                         pstm_int *d)
 {
         int32           res;
@@ -1560,7 +1600,7 @@ int32 pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
  *      y = g**x (mod b)
  *      Some restrictions... x must be positive and < b
  */
-int32 pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
+int32 FAST_FUNC pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
                         pstm_int *Y)
 {
         pstm_int        M[32], res; /* Keep this winsize based: (1 << max_winsize) */
@@ -1801,7 +1841,7 @@ LBL_RES:pstm_clear(&res);
 /*
 
 */
-int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
+int32 FAST_FUNC pstm_add(pstm_int *a, pstm_int *b, pstm_int *c)
 {
         int32   res;
         int     sa, sb; //bbox: was int16
@@ -1862,6 +1902,7 @@ static void pstm_reverse (unsigned char *s, int len) //bbox: was int16 len
         No reverse.  Useful in some of the EIP-154 PKA stuff where special byte
         order seems to come into play more often
 */
+#if 0 //UNUSED
 int32 pstm_to_unsigned_bin_nr(psPool_t *pool, pstm_int *a, unsigned char *b)
 {
         int32     res;
@@ -1883,11 +1924,12 @@ int32 pstm_to_unsigned_bin_nr(psPool_t *pool, pstm_int *a, unsigned char *b)
         pstm_clear(&t);
         return PS_SUCCESS;
 }
+#endif
 /******************************************************************************/
 /*
 
 */
-int32 pstm_to_unsigned_bin(psPool_t *pool, pstm_int *a, unsigned char *b)
+int32 FAST_FUNC pstm_to_unsigned_bin(psPool_t *pool, pstm_int *a, unsigned char *b)
 {
         int32     res;
         int     x; //bbox: was int16
@@ -1910,11 +1952,12 @@ int32 pstm_to_unsigned_bin(psPool_t *pool, pstm_int *a, unsigned char *b)
         return PS_SUCCESS;
 }
 
+#if 0 //UNUSED
 /******************************************************************************/
 /*
         compare against a single digit
 */
-int32 pstm_cmp_d(pstm_int *a, pstm_digit b)
+static int32 pstm_cmp_d(pstm_int *a, pstm_digit b)
 {
         /* compare based on sign */
         if ((b && a->used == 0) || a->sign == PSTM_NEG) {
@@ -2259,5 +2302,7 @@ LBL_Y: pstm_clear(&y);
 LBL_X: pstm_clear(&x);
         return res;
 }
+#endif //UNUSED
+
 #endif /* !DISABLE_PSTM */
 /******************************************************************************/
diff --git a/networking/tls_pstm.h b/networking/tls_pstm.h
index df705adce..bc7a0119a 100644
--- a/networking/tls_pstm.h
+++ b/networking/tls_pstm.h
@@ -136,148 +136,148 @@ typedef struct  {
 #define pstm_isodd(a)  (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? PS_TRUE : PS_FALSE)
 #define pstm_abs(a, b)  { pstm_copy(a, b); (b)->sign  = 0; }
 
-extern void pstm_set(pstm_int *a, pstm_digit b);
+//made static:extern void pstm_set(pstm_int *a, pstm_digit b);
 
-extern void pstm_zero(pstm_int * a);
+//made static:extern void pstm_zero(pstm_int * a);
 
 //bbox: pool unused
 #define pstm_init(pool, a) \
         pstm_init(      a)
-extern int32 pstm_init(psPool_t *pool, pstm_int * a);
+//made static:extern int32 pstm_init(psPool_t *pool, pstm_int * a);
 
 //bbox: pool unused
 #define pstm_init_size(pool, a, size) \
         pstm_init_size(      a, size)
-extern int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size);
+extern int32 pstm_init_size(psPool_t *pool, pstm_int * a, uint32 size) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_init_copy(pool, a, b, toSqr) \
         pstm_init_copy(      a, b, toSqr)
-extern int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b,
-                                int toSqr); //bbox: was int16 toSqr
+//made static:extern int32 pstm_init_copy(psPool_t *pool, pstm_int * a, pstm_int * b,
+//made static:                          int toSqr); //bbox: was int16 toSqr
 
-extern int pstm_count_bits (pstm_int * a); //bbox: was returning int16
+//made static:extern int pstm_count_bits (pstm_int * a) FAST_FUNC; //bbox: was returning int16
 
 //bbox: pool unused
 #define pstm_init_for_read_unsigned_bin(pool, a, len) \
         pstm_init_for_read_unsigned_bin(      a, len)
 extern int32 pstm_init_for_read_unsigned_bin(psPool_t *pool, pstm_int *a,
-                                uint32 len);
+                                uint32 len) FAST_FUNC;
 
-extern int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c);
+extern int32 pstm_read_unsigned_bin(pstm_int *a, unsigned char *b, int32 c) FAST_FUNC;
 
-extern int32 pstm_unsigned_bin_size(pstm_int *a);
+extern int32 pstm_unsigned_bin_size(pstm_int *a) FAST_FUNC;
 
 extern int32 pstm_copy(pstm_int * a, pstm_int * b);
 
-extern void pstm_exch(pstm_int * a, pstm_int * b);
+//made static:extern void pstm_exch(pstm_int * a, pstm_int * b);
 
-extern void pstm_clear(pstm_int * a);
+extern void pstm_clear(pstm_int * a) FAST_FUNC;
 
 extern void pstm_clear_multi(pstm_int *mp0, pstm_int *mp1, pstm_int *mp2,
                                 pstm_int *mp3, pstm_int *mp4, pstm_int *mp5, pstm_int *mp6,
-                                pstm_int *mp7);
+                                pstm_int *mp7) FAST_FUNC;
 
-extern int32 pstm_grow(pstm_int * a, int size); //bbox: was int16 size
+extern int32 pstm_grow(pstm_int * a, int size) FAST_FUNC; //bbox: was int16 size
 
-extern void pstm_clamp(pstm_int * a);
+extern void pstm_clamp(pstm_int * a) FAST_FUNC;
 
-extern int32 pstm_cmp(pstm_int * a, pstm_int * b);
+extern int32 pstm_cmp(pstm_int * a, pstm_int * b) FAST_FUNC;
 
-extern int32 pstm_cmp_mag(pstm_int * a, pstm_int * b);
+extern int32 pstm_cmp_mag(pstm_int * a, pstm_int * b) FAST_FUNC;
 
-extern void pstm_rshd(pstm_int *a, int x); //bbox: was int16 x
+//made static:extern void pstm_rshd(pstm_int *a, int x); //bbox: was int16 x
 
-extern int32 pstm_lshd(pstm_int * a, int b); //bbox: was int16 b
+//made static:extern int32 pstm_lshd(pstm_int * a, int b); //bbox: was int16 b
 
 //bbox: pool unused
 #define pstm_div(pool, a, b, c, d) \
         pstm_div(      a, b, c, d)
-extern int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
-                                pstm_int *d);
+//made static:extern int32 pstm_div(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
+//made static:                          pstm_int *d);
 
 //bbox: pool unused
 #define pstm_div_2d(pool, a, b, c, d) \
         pstm_div_2d(      a, b, c, d)
-extern int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
-                                pstm_int *d); //bbox: was int16 b
+//made static:extern int32 pstm_div_2d(psPool_t *pool, pstm_int *a, int b, pstm_int *c,
+//made static:                          pstm_int *d); //bbox: was int16 b
 
-extern int32 pstm_div_2(pstm_int * a, pstm_int * b);
+extern int32 pstm_div_2(pstm_int * a, pstm_int * b) FAST_FUNC;
 
-extern int32 s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c);
+extern int32 s_pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c) FAST_FUNC;
 
-extern int32 pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c);
+extern int32 pstm_sub(pstm_int *a, pstm_int *b, pstm_int *c) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_sub_d(pool, a, b, c) \
         pstm_sub_d(      a, b, c)
-extern int32 pstm_sub_d(psPool_t *pool, pstm_int *a, pstm_digit b, pstm_int *c);
+extern int32 pstm_sub_d(psPool_t *pool, pstm_int *a, pstm_digit b, pstm_int *c) FAST_FUNC;
 
-extern int32 pstm_mul_2(pstm_int * a, pstm_int * b);
+extern int32 pstm_mul_2(pstm_int * a, pstm_int * b) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_mod(pool, a, b, c) \
         pstm_mod(      a, b, c)
-extern int32 pstm_mod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c);
+//made static:extern int32 pstm_mod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c);
 
 //bbox: pool unused
 #define pstm_mulmod(pool, a, b, c, d) \
         pstm_mulmod(      a, b, c, d)
 extern int32 pstm_mulmod(psPool_t *pool, pstm_int *a, pstm_int *b, pstm_int *c,
-                                pstm_int *d);
+                                pstm_int *d) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_exptmod(pool, G, X, P, Y) \
         pstm_exptmod(      G, X, P, Y)
 extern int32 pstm_exptmod(psPool_t *pool, pstm_int *G, pstm_int *X, pstm_int *P,
-                                pstm_int *Y);
+                                pstm_int *Y) FAST_FUNC;
 
-extern int32 pstm_2expt(pstm_int *a, int b); //bbox: was int16 b
+//made static:extern int32 pstm_2expt(pstm_int *a, int b); //bbox: was int16 b
 
-extern int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c);
+extern int32 pstm_add(pstm_int *a, pstm_int *b, pstm_int *c) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_to_unsigned_bin(pool, a, b) \
         pstm_to_unsigned_bin(      a, b)
 extern int32 pstm_to_unsigned_bin(psPool_t *pool, pstm_int *a,
-                                unsigned char *b);
+                                unsigned char *b) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_to_unsigned_bin_nr(pool, a, b) \
         pstm_to_unsigned_bin_nr(      a, b)
 extern int32 pstm_to_unsigned_bin_nr(psPool_t *pool, pstm_int *a,
-                                unsigned char *b);
+                                unsigned char *b) FAST_FUNC;
 
-extern int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho);
+//made static:extern int32 pstm_montgomery_setup(pstm_int *a, pstm_digit *rho);
 
 //bbox: pool unused
 #define pstm_montgomery_reduce(pool, a, m, mp, paD, paDlen) \
         pstm_montgomery_reduce(      a, m, mp, paD, paDlen)
 extern int32 pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
-                                pstm_digit mp, pstm_digit *paD, uint32 paDlen);
+                                pstm_digit mp, pstm_digit *paD, uint32 paDlen) FAST_FUNC;
 
 #define pstm_mul_comba(pool, A, B, C, paD, paDlen) \
         pstm_mul_comba(      A, B, C, paD, paDlen)
 extern int32 pstm_mul_comba(psPool_t *pool, pstm_int *A, pstm_int *B,
-                                pstm_int *C, pstm_digit *paD, uint32 paDlen);
+                                pstm_int *C, pstm_digit *paD, uint32 paDlen) FAST_FUNC;
 
 //bbox: pool unused
 #define pstm_sqr_comba(pool, A, B, paD, paDlen) \
         pstm_sqr_comba(      A, B, paD, paDlen)
 extern int32 pstm_sqr_comba(psPool_t *pool, pstm_int *A, pstm_int *B,
-                                pstm_digit *paD, uint32 paDlen);
+                                pstm_digit *paD, uint32 paDlen) FAST_FUNC;
 
-extern int32 pstm_cmp_d(pstm_int *a, pstm_digit b);
+//made static:extern int32 pstm_cmp_d(pstm_int *a, pstm_digit b);
 
-extern int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b);
+//made static:extern int32 pstm_montgomery_calc_normalization(pstm_int *a, pstm_int *b);
 
-extern int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c);
+//made static:extern int32 pstm_mul_d(pstm_int *a, pstm_digit b, pstm_int *c);
 
 //bbox: pool unused
 #define pstm_invmod(pool, a, b, c) \
         pstm_invmod(      a, b, c)
 extern int32 pstm_invmod(psPool_t *pool, pstm_int * a, pstm_int * b,
-                                pstm_int * c);
+                                pstm_int * c) FAST_FUNC;
 
 #else /* DISABLE_PSTM */
         typedef int32 pstm_int;
diff --git a/networking/tls_pstm_montgomery_reduce.c b/networking/tls_pstm_montgomery_reduce.c
index 3391755e1..d46e2aa2b 100644
--- a/networking/tls_pstm_montgomery_reduce.c
+++ b/networking/tls_pstm_montgomery_reduce.c
@@ -340,7 +340,7 @@ asm(                                  \
 #define LO 0
 
 /* computes x/R == x (mod N) via Montgomery Reduction */
-int32 pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
+int32 FAST_FUNC pstm_montgomery_reduce(psPool_t *pool, pstm_int *a, pstm_int *m,
                 pstm_digit mp, pstm_digit *paD, uint32 paDlen)
 {
         pstm_digit      *c, *_c, *tmpm, mu;
diff --git a/networking/tls_pstm_mul_comba.c b/networking/tls_pstm_mul_comba.c
index 6ba152bc1..ac4fcc3ef 100644
--- a/networking/tls_pstm_mul_comba.c
+++ b/networking/tls_pstm_mul_comba.c
@@ -754,7 +754,7 @@ static int32 pstm_mul_comba32(pstm_int *A, pstm_int *B, pstm_int *C)
 
 /******************************************************************************/
 
-int32 pstm_mul_comba(psPool_t *pool, pstm_int *A, pstm_int *B, pstm_int *C,
+int32 FAST_FUNC pstm_mul_comba(psPool_t *pool, pstm_int *A, pstm_int *B, pstm_int *C,
                         pstm_digit *paD, uint32 paDlen)
 {
 #ifdef USE_1024_KEY_SPEED_OPTIMIZATIONS
diff --git a/networking/tls_pstm_sqr_comba.c b/networking/tls_pstm_sqr_comba.c
index d5c74d2f0..8604132d6 100644
--- a/networking/tls_pstm_sqr_comba.c
+++ b/networking/tls_pstm_sqr_comba.c
@@ -1085,7 +1085,7 @@ static int32 pstm_sqr_comba32(pstm_int *A, pstm_int *B)
 /******************************************************************************/
 /*
  */
-int32 pstm_sqr_comba(psPool_t *pool, pstm_int *A, pstm_int *B, pstm_digit *paD,
+int32 FAST_FUNC pstm_sqr_comba(psPool_t *pool, pstm_int *A, pstm_int *B, pstm_digit *paD,
                 uint32 paDlen)
 {
 #ifdef USE_1024_KEY_SPEED_OPTIMIZATIONS
diff --git a/networking/tls_rsa.c b/networking/tls_rsa.c
index 631397e4d..5fda1cb49 100644
--- a/networking/tls_rsa.c
+++ b/networking/tls_rsa.c
@@ -173,7 +173,9 @@ error:
         res = PS_FAILURE;
 done:
         if (type == PRIVKEY_TYPE && key->optimized) {
-                pstm_clear_multi(&tmpa, &tmpb, NULL, NULL, NULL, NULL, NULL, NULL);
+                //pstm_clear_multi(&tmpa, &tmpb, NULL, NULL, NULL, NULL, NULL, NULL);
+                pstm_clear(&tmpa);
+                pstm_clear(&tmpb);
         }
         pstm_clear(&tmp);
         return res;
diff --git a/networking/traceroute.c b/networking/traceroute.c
index a027b928a..bdf451186 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -217,7 +217,7 @@
 //config:       Utility to trace the route of IP packets.
 //config:
 //config:config TRACEROUTE6
-//config:       bool "traceroute6 (12 kb)"
+//config:       bool "traceroute6 (13 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
diff --git a/networking/tunctl.c b/networking/tunctl.c
index f2dc645a1..a0e3926e9 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TUNCTL
-//config:       bool "tunctl (6.4 kb)"
+//config:       bool "tunctl (6.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index e5958804b..f16fc0a4f 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -4,7 +4,7 @@
 #
 
 config UDHCPD
-        bool "udhcpd"
+        bool "udhcpd (21 kb)"
         default y
         select PLATFORM_LINUX
         help
@@ -44,7 +44,7 @@ config DHCPD_LEASES_FILE
         of the file. Normally it is safe to leave it untouched.
 
 config DUMPLEASES
-        bool "dumpleases (6.4 kb)"
+        bool "dumpleases (5.1 kb)"
         default y
         help
         dumpleases displays the leases written out by the udhcpd.
@@ -52,7 +52,7 @@ config DUMPLEASES
         by the absolute time that it expires in seconds from epoch.
 
 config DHCPRELAY
-        bool "dhcprelay (5.8 kb)"
+        bool "dhcprelay (5.2 kb)"
         default y
         help
         dhcprelay listens for DHCP requests on one or more interfaces
@@ -60,7 +60,7 @@ config DHCPRELAY
         server.
 
 config UDHCPC
-        bool "udhcpc"
+        bool "udhcpc (24 kb)"
         default y
         select PLATFORM_LINUX
         help
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index e5fd74f91..fc4de5716 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -272,6 +272,15 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
                         goto complain; /* complain and return NULL */
 
                 if (optionptr[OPT_CODE] == code) {
+                        if (optionptr[OPT_LEN] == 0) {
+                                /* So far no valid option with length 0 known.
+                                 * Having this check means that searching
+                                 * for DHCP_MESSAGE_TYPE need not worry
+                                 * that returned pointer might be unsafe
+                                 * to dereference.
+                                 */
+                                goto complain; /* complain and return NULL */
+                        }
                         log_option("option found", optionptr);
                         return optionptr + OPT_DATA;
                 }
@@ -289,6 +298,16 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
         return NULL;
 }
 
+uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code)
+{
+        uint8_t *r = udhcp_get_option(packet, code);
+        if (r) {
+                if (r[-OPT_DATA + OPT_LEN] != 4)
+                        r = NULL;
+        }
+        return r;
+}
+
 /* Return the position of the 'end' option (no bounds checking) */
 int FAST_FUNC udhcp_end_option(uint8_t *optionptr)
 {
@@ -403,6 +422,7 @@ static NOINLINE void attach_option(
                 if (errno)
                         bb_error_msg_and_die("malformed hex string '%s'", buffer);
                 length = end - allocated;
+                buffer = allocated;
         }
 #if ENABLE_FEATURE_UDHCP_RFC3397
         if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_DNS_STRING) {
@@ -422,15 +442,14 @@ static NOINLINE void attach_option(
                         new->data = xmalloc(length + OPT_DATA);
                         new->data[OPT_CODE] = optflag->code;
                         new->data[OPT_LEN] = length;
-                        memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer),
-                                        length);
+                        memcpy(new->data + OPT_DATA, buffer, length);
                 } else {
                         new->data = xmalloc(length + D6_OPT_DATA);
                         new->data[D6_OPT_CODE] = optflag->code >> 8;
                         new->data[D6_OPT_CODE + 1] = optflag->code & 0xff;
                         new->data[D6_OPT_LEN] = length >> 8;
                         new->data[D6_OPT_LEN + 1] = length & 0xff;
-                        memcpy(new->data + D6_OPT_DATA, (allocated ? allocated : buffer),
+                        memcpy(new->data + D6_OPT_DATA, buffer,
                                         length);
                 }
 
@@ -453,6 +472,8 @@ static NOINLINE void attach_option(
                         /* actually 255 is ok too, but adding a space can overlow it */
 
                         existing->data = xrealloc(existing->data, OPT_DATA + 1 + old_len + length);
+// So far dhcp_optflags[] has no OPTION_STRING[_HOST] | OPTION_LIST items
+#if 0
                         if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING
                          || (optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING_HOST
                         ) {
@@ -460,7 +481,9 @@ static NOINLINE void attach_option(
                                 existing->data[OPT_DATA + old_len] = ' ';
                                 old_len++;
                         }
-                        memcpy(existing->data + OPT_DATA + old_len, (allocated ? allocated : buffer), length);
+#endif
+
+                        memcpy(existing->data + OPT_DATA + old_len, buffer, length);
                         existing->data[OPT_LEN] = old_len + length;
                 } /* else, ignore the data, we could put this in a second option in the future */
         } /* else, ignore the new data */
@@ -534,7 +557,7 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg,
                         if (retval)
                                 retval = udhcp_str2nip(val, buffer + 4);
                         break;
-case_OPTION_STRING:
+ case_OPTION_STRING:
                 case OPTION_STRING:
                 case OPTION_STRING_HOST:
 #if ENABLE_FEATURE_UDHCP_RFC3397
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 7ad603d33..62f9a2a4a 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -119,7 +119,7 @@ enum {
 //#define DHCP_TIME_SERVER      0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */
 //#define DHCP_NAME_SERVER      0x05 /* IEN 116 _really_ ancient kind of NS */
 //#define DHCP_DNS_SERVER       0x06
-//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog)
+//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog) */
 //#define DHCP_COOKIE_SERVER    0x08 /* "quote of the day" server */
 //#define DHCP_LPR_SERVER       0x09
 #define DHCP_HOST_NAME          0x0c /* 12: either client informs server or server gives name to client */
@@ -205,6 +205,10 @@ extern const uint8_t dhcp_option_lengths[] ALIGN1;
 unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings);
 
 uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC;
+/* Same as above + ensures that option length is 4 bytes
+ * (returns NULL if size is different)
+ */
+uint8_t *udhcp_get_option32(struct dhcp_packet *packet, int code) FAST_FUNC;
 int udhcp_end_option(uint8_t *optionptr) FAST_FUNC;
 void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC;
 #if ENABLE_UDHCPC || ENABLE_UDHCPD
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 3c6129249..38c91cbb4 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UDHCPC6
-//config:       bool "udhcpc6"
+//config:       bool "udhcpc6 (21 kb)"
 //config:       default n  # not yet ready
 //config:       depends on FEATURE_IPV6
 //config:       help
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 4b23e4d39..dcec8cdfd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet)
                 temp = udhcp_get_option(packet, code);
                 *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
                 putenv(*curr++);
-                if (code == DHCP_SUBNET) {
+                if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) {
                         /* Subnet option: make things like "$ip/$mask" possible */
                         uint32_t subnet;
                         move_from_unaligned32(subnet, temp);
@@ -1691,7 +1691,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
  * They say ISC DHCP client supports this case.
  */
                                 server_addr = 0;
-                                temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                                temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
                                 if (!temp) {
                                         bb_error_msg("no server ID, using 0.0.0.0");
                                 } else {
@@ -1718,7 +1718,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 struct in_addr temp_addr;
                                 uint8_t *temp;
 
-                                temp = udhcp_get_option(&packet, DHCP_LEASE_TIME);
+                                temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME);
                                 if (!temp) {
                                         bb_error_msg("no lease time with ACK, using 1 hour lease");
                                         lease_seconds = 60 * 60;
@@ -1813,7 +1813,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         uint32_t svid;
                                         uint8_t *temp;
 
-                                        temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                                        temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
                                         if (!temp) {
  non_matching_svid:
                                                 log1("received DHCP NAK with wrong"
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index a8cd3f03b..0c55fa5e4 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -378,7 +378,7 @@ struct config_keyword {
 #define OFS(field) offsetof(struct server_config_t, field)
 
 static const struct config_keyword keywords[] = {
-        /* keyword        handler           variable address               default */
+        /* keyword        handler           variable address    default */
         {"start"        , udhcp_str2nip   , OFS(start_ip     ), "192.168.0.20"},
         {"end"          , udhcp_str2nip   , OFS(end_ip       ), "192.168.0.254"},
         {"interface"    , read_str        , OFS(interface    ), "eth0"},
@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet)
 static uint32_t select_lease_time(struct dhcp_packet *packet)
 {
         uint32_t lease_time_sec = server_config.max_lease_sec;
-        uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME);
+        uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME);
         if (lease_time_opt) {
                 move_from_unaligned32(lease_time_sec, lease_time_opt);
                 lease_time_sec = ntohl(lease_time_sec);
@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Get SERVER_ID if present */
-                server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID);
                 if (server_id_opt) {
                         uint32_t server_id_network_order;
                         move_from_unaligned32(server_id_network_order, server_id_opt);
@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Get REQUESTED_IP if present */
-                requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+                requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP);
                 if (requested_ip_opt) {
                         move_from_unaligned32(requested_nip, requested_ip_opt);
                 }
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 8548c8c3b..3cc5f2460 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config VCONFIG
-//config:       bool "vconfig (2.5 kb)"
+//config:       bool "vconfig (2.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/networking/wget.c b/networking/wget.c
index ae5c945d0..3cae1192c 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -9,7 +9,7 @@
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
 //config:config WGET
-//config:       bool "wget (35 kb)"
+//config:       bool "wget (38 kb)"
 //config:       default y
 //config:       help
 //config:       wget is a utility for non-interactive download of files from HTTP
@@ -123,14 +123,14 @@
 //usage:#define wget_trivial_usage
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
 //usage:       "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n"
-//usage:       "        [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
+//usage:       "        [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n"
 /* Since we ignore these opts, we don't show them in --help */
 /* //usage:    "        [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */
 /* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
-//usage:       "        [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:       "        [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
 //usage:        )
 //usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
-//usage:       "[-cq] [-O FILE] [-Y on/off] [-P DIR] [-S] [-U AGENT]"
+//usage:       "[-cq] [-O FILE] [-o FILE] [-Y on/off] [-P DIR] [-S] [-U AGENT]"
 //usage:                        IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
 //usage:        )
 //usage:#define wget_full_usage "\n\n"
@@ -147,6 +147,7 @@
 //usage:     "\n        -T SEC          Network read timeout is SEC seconds"
 //usage:        )
 //usage:     "\n        -O FILE         Save to FILE ('-' for stdout)"
+//usage:     "\n        -o FILE         Log messages to FILE"
 //usage:     "\n        -U STR          Use STR for User-Agent header"
 //usage:     "\n        -Y on/off       Use proxy"
 
@@ -231,9 +232,11 @@ struct globals {
         unsigned char user_headers; /* Headers mentioned by the user */
 #endif
         char *fname_out;        /* where to direct output (-O) */
+        char *fname_log;        /* where to direct log (-o) */
         const char *proxy_flag; /* Use proxies if env vars are set */
         const char *user_agent; /* "User-Agent" header field */
         int output_fd;
+        int log_fd;
         int o_flags;
 #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
@@ -262,16 +265,17 @@ enum {
         WGET_OPT_QUIET      = (1 << 1),
         WGET_OPT_SERVER_RESPONSE = (1 << 2),
         WGET_OPT_OUTNAME    = (1 << 3),
-        WGET_OPT_PREFIX     = (1 << 4),
-        WGET_OPT_PROXY      = (1 << 5),
-        WGET_OPT_USER_AGENT = (1 << 6),
-        WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 7),
-        WGET_OPT_RETRIES    = (1 << 8),
-        WGET_OPT_nsomething = (1 << 9),
-        WGET_OPT_HEADER     = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
-        WGET_OPT_POST_DATA  = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
-        WGET_OPT_SPIDER     = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
-        WGET_OPT_NO_CHECK_CERT = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_LOGNAME    = (1 << 4),
+        WGET_OPT_PREFIX     = (1 << 5),
+        WGET_OPT_PROXY      = (1 << 6),
+        WGET_OPT_USER_AGENT = (1 << 7),
+        WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8),
+        WGET_OPT_RETRIES    = (1 << 9),
+        WGET_OPT_nsomething = (1 << 10),
+        WGET_OPT_HEADER     = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_POST_DATA  = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_SPIDER     = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_NO_CHECK_CERT = (1 << 14) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
 };
 
 enum {
@@ -287,6 +291,10 @@ static void progress_meter(int flag)
         if (option_mask32 & WGET_OPT_QUIET)
                 return;
 
+        /* Don't save progress to log file */
+        if (G.log_fd >= 0)
+                return;
+
         if (flag == PROGRESS_START)
                 bb_progress_init(&G.pmt, G.curfile);
 
@@ -900,6 +908,10 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
         polldata.fd = fileno(dfp);
         polldata.events = POLLIN | POLLPRI;
 #endif
+        if (G.output_fd == 1)
+                fprintf(stderr, "writing to stdout\n");
+        else
+                fprintf(stderr, "saving to '%s'\n", G.fname_out);
         progress_meter(PROGRESS_START);
 
         if (G.chunked)
@@ -1045,6 +1057,10 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
         G.chunked = 0;  /* makes it show 100% even for chunked download */
         G.got_clen = 1; /* makes it show 100% even for download of (formerly) unknown size */
         progress_meter(PROGRESS_END);
+        if (G.output_fd == 1)
+                fprintf(stderr, "written to stdout\n");
+        else
+                fprintf(stderr, "'%s' saved\n", G.fname_out);
 }
 
 static void download_one_url(const char *url)
@@ -1404,6 +1420,8 @@ However, in real world it was observed that some web servers
                         xclose(G.output_fd);
                         G.output_fd = -1;
                 }
+        } else {
+                fprintf(stderr, "remote file exists\n");
         }
 
         if (dfp != sfp) {
@@ -1433,6 +1451,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
                 "quiet\0"            No_argument       "q"
                 "server-response\0"  No_argument       "S"
                 "output-document\0"  Required_argument "O"
+                "output-file\0"      Required_argument "o"
                 "directory-prefix\0" Required_argument "P"
                 "proxy\0"            Required_argument "Y"
                 "user-agent\0"       Required_argument "U"
@@ -1476,7 +1495,7 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
 #endif
         GETOPT32(argv, "^"
-                "cqSO:P:Y:U:T:+"
+                "cqSO:o:P:Y:U:T:+"
                 /*ignored:*/ "t:"
                 /*ignored:*/ "n::"
                 /* wget has exactly four -n<letter> opts, all of which we can ignore:
@@ -1491,7 +1510,7 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
                 "-1" /* at least one URL */
                 IF_FEATURE_WGET_LONG_OPTIONS(":\xff::") /* --header is a list */
                 LONGOPTS
-                , &G.fname_out, &G.dir_prefix,
+                , &G.fname_out, &G.fname_log, &G.dir_prefix,
                 &G.proxy_flag, &G.user_agent,
                 IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
                 NULL, /* -t RETRIES */
@@ -1553,12 +1572,25 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
                 G.o_flags = O_WRONLY | O_CREAT | O_TRUNC;
         }
 
+        G.log_fd = -1;
+        if (G.fname_log) { /* -o FILE ? */
+                if (!LONE_DASH(G.fname_log)) { /* not -o - ? */
+                        /* compat with wget: -o FILE can overwrite */
+                        G.log_fd = xopen(G.fname_log, O_WRONLY | O_CREAT | O_TRUNC);
+                        /* Redirect only stderr to log file, so -O - will work */
+                        xdup2(G.log_fd, STDERR_FILENO);
+                }
+        }
+
         while (*argv)
                 download_one_url(*argv++);
 
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
 
+        if (G.log_fd >= 0)
+                xclose(G.log_fd);
+
 #if ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_WGET_LONG_OPTIONS
         free(G.extra_headers);
 #endif
diff --git a/networking/whois.c b/networking/whois.c
index f3da32b4e..55e1de964 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -10,7 +10,7 @@
  * Add proxy support
  */
 //config:config WHOIS
-//config:       bool "whois (6.6 kb)"
+//config:       bool "whois (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       whois is a client for the whois directory service
diff --git a/networking/zcip.c b/networking/zcip.c
index 94e49adcb..434762f12 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -14,7 +14,7 @@
  * certainly be used.  Its naming is built over multicast DNS.
  */
 //config:config ZCIP
-//config:       bool "zcip (7.8 kb)"
+//config:       bool "zcip (8.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
diff --git a/printutils/lpd.c b/printutils/lpd.c
index 662d3a224..ce5944026 100644
--- a/printutils/lpd.c
+++ b/printutils/lpd.c
@@ -70,7 +70,7 @@
  * mv -f ./"$DATAFILE" save/
  */
 //config:config LPD
-//config:       bool "lpd (5.3 kb)"
+//config:       bool "lpd (5.5 kb)"
 //config:       default y
 //config:       help
 //config:       lpd is a print spooling daemon.
diff --git a/printutils/lpr.c b/printutils/lpr.c
index 808ecb5dc..7acb6c357 100644
--- a/printutils/lpr.c
+++ b/printutils/lpr.c
@@ -12,13 +12,13 @@
  * See RFC 1179 for protocol description.
  */
 //config:config LPR
-//config:       bool "lpr (10 kb)"
+//config:       bool "lpr (9.9 kb)"
 //config:       default y
 //config:       help
 //config:       lpr sends files (or standard input) to a print spooling daemon.
 //config:
 //config:config LPQ
-//config:       bool "lpq (10 kb)"
+//config:       bool "lpq (9.9 kb)"
 //config:       default y
 //config:       help
 //config:       lpq is a print spool queue examination and manipulation program.
diff --git a/procps/free.c b/procps/free.c
index ee0cd981a..3acfc4072 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FREE
-//config:       bool "free (2.4 kb)"
+//config:       bool "free (3.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
diff --git a/procps/iostat.c b/procps/iostat.c
index 09aae7102..7bf567c34 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config IOSTAT
-//config:       bool "iostat (7.4 kb)"
+//config:       bool "iostat (7.6 kb)"
 //config:       default y
 //config:       help
 //config:       Report CPU and I/O statistics
diff --git a/procps/kill.c b/procps/kill.c
index 4477dedb7..073e74332 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KILL
-//config:       bool "kill (2.6 kb)"
+//config:       bool "kill (3.1 kb)"
 //config:       default y
 //config:       help
 //config:       The command kill sends the specified signal to the specified
diff --git a/procps/lsof.c b/procps/lsof.c
index 4917cf899..21ac85ed3 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LSOF
-//config:       bool "lsof (3.6 kb)"
+//config:       bool "lsof (3.4 kb)"
 //config:       default y
 //config:       help
 //config:       Show open files in the format of:
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 3c72f2705..e7dc4312a 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MPSTAT
-//config:       bool "mpstat (10 kb)"
+//config:       bool "mpstat (9.8 kb)"
 //config:       default y
 //config:       help
 //config:       Per-processor statistics
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 166c8ab18..a01d19a6a 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -6,7 +6,7 @@
  * Contact me: vda.linux@googlemail.com
  */
 //config:config NMETER
-//config:       bool "nmeter (10 kb)"
+//config:       bool "nmeter (11 kb)"
 //config:       default y
 //config:       help
 //config:       Prints selected system stats continuously, one line per update.
diff --git a/procps/pgrep.c b/procps/pgrep.c
index a16a6e959..495e0ef9d 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -7,13 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PGREP
-//config:       bool "pgrep (6.8 kb)"
+//config:       bool "pgrep (6.5 kb)"
 //config:       default y
 //config:       help
 //config:       Look for processes by name.
 //config:
 //config:config PKILL
-//config:       bool "pkill (7.6 kb)"
+//config:       bool "pkill (7.5 kb)"
 //config:       default y
 //config:       help
 //config:       Send signals to processes by name.
diff --git a/procps/pidof.c b/procps/pidof.c
index 98d7949f8..5595e3421 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PIDOF
-//config:       bool "pidof (6.6 kb)"
+//config:       bool "pidof (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       Pidof finds the process id's (pids) of the named programs. It prints
diff --git a/procps/pmap.c b/procps/pmap.c
index c8fa0d280..9e541c707 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -37,6 +37,12 @@
 # define DASHES "--------"
 #endif
 
+#if ULLONG_MAX == 0xffffffff
+# define AFMTLL "8"
+#else
+# define AFMTLL "16"
+#endif
+
 enum {
         OPT_x = 1 << 0,
         OPT_q = 1 << 1,
@@ -46,7 +52,7 @@ static void print_smaprec(struct smaprec *currec, void *data)
 {
         unsigned opt = (uintptr_t)data;
 
-        printf("%0" AFMT "lx ", currec->smap_start);
+        printf("%0" AFMTLL "llx ", currec->smap_start);
 
         if (opt & OPT_x)
                 printf("%7lu %7lu %7lu %7lu ",
diff --git a/procps/powertop.c b/procps/powertop.c
index 004b4ce19..e70f5433b 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config POWERTOP
-//config:       bool "powertop (9.1 kb)"
+//config:       bool "powertop (9.6 kb)"
 //config:       default y
 //config:       help
 //config:       Analyze power consumption on Intel-based laptops
diff --git a/procps/pstree.c b/procps/pstree.c
index 4fda1c21c..1d124d2d2 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PSTREE
-//config:       bool "pstree (9.4 kb)"
+//config:       bool "pstree (9.3 kb)"
 //config:       default y
 //config:       help
 //config:       Display a tree of processes.
diff --git a/procps/pwdx.c b/procps/pwdx.c
index 6009e2aa3..24ba25d90 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PWDX
-//config:       bool "pwdx (3.5 kb)"
+//config:       bool "pwdx (3.7 kb)"
 //config:       default y
 //config:       help
 //config:       Report current working directory of a process
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 827e09cce..5fa7646d1 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -11,7 +11,7 @@
  * v1.01.1 - busybox applet aware by <solar@gentoo.org>
  */
 //config:config BB_SYSCTL
-//config:       bool "sysctl (6.9 kb)"
+//config:       bool "sysctl (7.4 kb)"
 //config:       default y
 //config:       help
 //config:       Configure kernel parameters at runtime.
diff --git a/procps/top.c b/procps/top.c
index f016f5501..3db077060 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -50,7 +50,7 @@
  * chroot . ./top -bn1 >top1.out
  */
 //config:config TOP
-//config:       bool "top (17 kb)"
+//config:       bool "top (18 kb)"
 //config:       default y
 //config:       help
 //config:       The top program provides a dynamic real-time view of a running
diff --git a/procps/uptime.c b/procps/uptime.c
index 3262f41b4..31581271f 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -12,7 +12,7 @@
  * Added FEATURE_UPTIME_UTMP_SUPPORT flag.
  */
 //config:config UPTIME
-//config:       bool "uptime (632 bytes)"
+//config:       bool "uptime (3.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
diff --git a/procps/watch.c b/procps/watch.c
index 420e6d3d1..dbe427aad 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WATCH
-//config:       bool "watch (4.1 kb)"
+//config:       bool "watch (4.4 kb)"
 //config:       default y
 //config:       help
 //config:       watch is used to execute a program periodically, showing
diff --git a/runit/chpst.c b/runit/chpst.c
index c2641ce8a..5e77245f6 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -28,20 +28,20 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config CHPST
-//config:       bool "chpst (8.7 kb)"
+//config:       bool "chpst (9 kb)"
 //config:       default y
 //config:       help
 //config:       chpst changes the process state according to the given options, and
 //config:       execs specified program.
 //config:
 //config:config SETUIDGID
-//config:       bool "setuidgid (4.2 kb)"
+//config:       bool "setuidgid (4 kb)"
 //config:       default y
 //config:       help
 //config:       Sets soft resource limits as specified by options
 //config:
 //config:config ENVUIDGID
-//config:       bool "envuidgid (3.6 kb)"
+//config:       bool "envuidgid (3.9 kb)"
 //config:       default y
 //config:       help
 //config:       Sets $UID to account's uid and $GID to account's gid
@@ -54,7 +54,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //config:       in the given directory
 //config:
 //config:config SOFTLIMIT
-//config:       bool "softlimit (4.3 kb)"
+//config:       bool "softlimit (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       Sets soft resource limits as specified by options
diff --git a/runit/runsv.c b/runit/runsv.c
index a67280b4b..ccc762d78 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSV
-//config:       bool "runsv (7.2 kb)"
+//config:       bool "runsv (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       runsv starts and monitors a service and optionally an appendant log
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 11ab40abf..55dd47e0d 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSVDIR
-//config:       bool "runsvdir (6 kb)"
+//config:       bool "runsvdir (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       runsvdir starts a runsv process for each subdirectory, or symlink to
diff --git a/runit/sv.c b/runit/sv.c
index 8054daedf..5c249ff95 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -154,7 +154,7 @@ Exit Codes
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config SV
-//config:       bool "sv (7.8 kb)"
+//config:       bool "sv (8.5 kb)"
 //config:       default y
 //config:       help
 //config:       sv reports the current status and controls the state of services
@@ -169,14 +169,14 @@ Exit Codes
 //config:       Defaults to "/var/service"
 //config:
 //config:config SVC
-//config:       bool "svc (7.8 kb)"
+//config:       bool "svc (8.4 kb)"
 //config:       default y
 //config:       help
 //config:       svc controls the state of services monitored by the runsv supervisor.
 //config:       It is compatible with daemontools command with the same name.
 //config:
 //config:config SVOK
-//config:       bool "svok"
+//config:       bool "svok (1.5 kb)"
 //config:       default y
 //config:       help
 //config:       svok checks whether runsv supervisor is running.
diff --git a/runit/svlogd.c b/runit/svlogd.c
index b0690d794..c9e5346d1 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -124,7 +124,7 @@ log message, you can use a pattern like this instead
 -*: *: pid *
 */
 //config:config SVLOGD
-//config:       bool "svlogd (15 kb)"
+//config:       bool "svlogd (16 kb)"
 //config:       default y
 //config:       help
 //config:       svlogd continuously reads log data from its standard input, optionally
diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c
index 8127fe261..9a9260f2c 100644
--- a/scripts/basic/split-include.c
+++ b/scripts/basic/split-include.c
@@ -133,7 +133,8 @@ int main(int argc, const char * argv [])
         is_same = 0;
         if ((fp_target = fopen(ptarget, "r")) != NULL)
         {
-            fgets(old_line, buffer_size, fp_target);
+            if (!fgets(old_line, buffer_size, fp_target))
+                ERROR_EXIT(ptarget);
             if (fclose(fp_target) != 0)
                 ERROR_EXIT(ptarget);
             if (!strcmp(line, old_line))
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index f69591c69..80bd55a68 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -142,7 +142,8 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 check_stdin();
         case ask_all:
                 fflush(stdout);
-                fgets(line, 128, stdin);
+                if (!fgets(line, 128, stdin))
+                        exit(1);
                 return;
         case set_default:
                 printf("%s\n", def);
@@ -395,7 +396,8 @@ static int conf_choice(struct menu *menu)
                         check_stdin();
                 case ask_all:
                         fflush(stdout);
-                        fgets(line, 128, stdin);
+                        if (!fgets(line, 128, stdin))
+                                exit(1);
                         strip(line);
                         if (line[0] == '?') {
                                 printf("\n%s\n", menu->sym->help ?
diff --git a/scripts/kconfig/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
index 79f6c5fb5..5b8e3e947 100644
--- a/scripts/kconfig/lxdialog/lxdialog.c
+++ b/scripts/kconfig/lxdialog/lxdialog.c
@@ -189,7 +189,7 @@ int j_inputbox(const char *t, int ac, const char *const *av)
         int ret = dialog_inputbox(t, av[2], atoi(av[3]), atoi(av[4]),
                                   ac == 6 ? av[5] : (char *)NULL);
         if (ret == 0)
-                fprintf(stderr, dialog_input_result);
+                fprintf(stderr, "%s", dialog_input_result);
         return ret;
 }
 
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 9fc837c9f..cda0473ac 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -498,7 +498,8 @@ static int exec_conf(void)
 
         *argptr++ = NULL;
 
-        pipe(pipefd);
+        if (pipe(pipefd))
+                _exit(EXIT_FAILURE);
         pid = fork();
         if (pid == 0) {
                 sigprocmask(SIG_SETMASK, &osset, NULL);
@@ -863,9 +864,11 @@ static void conf(struct menu *menu)
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
         int fd;
+        int len = strlen(text);
 
         fd = creat(".help.tmp", 0777);
-        write(fd, text, strlen(text));
+        if (write(fd, text, len) != len)
+                exit(1);
         close(fd);
         show_file(".help.tmp", title, r, c);
         unlink(".help.tmp");
diff --git a/shell/ash.c b/shell/ash.c
index 6d5c55d70..50d5ce9d4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -31,7 +31,7 @@
  */
 
 //config:config ASH
-//config:       bool "ash (77 kb)"
+//config:       bool "ash (78 kb)"
 //config:       default y
 //config:       depends on !NOMMU
 //config:       help
@@ -4600,7 +4600,7 @@ wait_block_or_sig(int *status)
                 /* Children exist, but none are ready. Sleep until interesting signal */
 #if 1
                 sigfillset(&mask);
-                sigprocmask(SIG_SETMASK, &mask, &mask);
+                sigprocmask2(SIG_SETMASK, &mask); /* mask is updated */
                 while (!got_sigchld && !pending_sig)
                         sigsuspend(&mask);
                 sigprocmask(SIG_SETMASK, &mask, NULL);
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index ec1b6c429..b9ee59bd0 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CTTYHACK
-//config:       bool "cttyhack (2.5 kb)"
+//config:       bool "cttyhack (2.4 kb)"
 //config:       default y
 //config:       help
 //config:       One common problem reported on the mailing list is the "can't
diff --git a/shell/hush.c b/shell/hush.c
index 90191408d..920a85299 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -93,7 +93,7 @@
  * add =~ regex match operator: STR =~ REGEX
  */
 //config:config HUSH
-//config:       bool "hush (64 kb)"
+//config:       bool "hush (68 kb)"
 //config:       default y
 //config:       help
 //config:       hush is a small shell. It handles the normal flow control
@@ -5998,7 +5998,7 @@ static const char *first_special_char_in_vararg(const char *cp)
 #endif
 static char *encode_then_expand_vararg(const char *str, int handle_squotes, int do_unbackslash)
 {
-#if !BASH_PATTERN_SUBST
+#if !BASH_PATTERN_SUBST && ENABLE_HUSH_CASE
         const int do_unbackslash = 0;
 #endif
         char *exp_str;
@@ -11442,7 +11442,7 @@ static int wait_for_child_or_signal(struct pipe *waitfor_pipe, pid_t waitfor_pid
                  * and get stuck in sigsuspend...
                  */
                 sigfillset(&oldset); /* block all signals, remember old set */
-                sigprocmask(SIG_SETMASK, &oldset, &oldset);
+                sigprocmask2(SIG_SETMASK, &oldset);
 
                 if (!sigisemptyset(&G.pending_set)) {
                         /* Crap! we raced with some signal! */
diff --git a/size_single_applets.sh b/size_single_applets.sh
index ee16d4de7..4b70e761f 100755
--- a/size_single_applets.sh
+++ b/size_single_applets.sh
@@ -1,4 +1,12 @@
 #!/bin/bash
+# Which config to use when updating the sizes in "official"
+# source tree? I am using x86 glibc toolchain of some typical distro,
+# not-static build, 32-bit defconfig build:
+# # CONFIG_STATIC is not set
+# CONFIG_CROSS_COMPILER_PREFIX=""
+# CONFIG_EXTRA_CFLAGS="-m32"
+# CONFIG_EXTRA_LDFLAGS="-m32"
+
 # The list of all applet config symbols
 test -f include/applets.h || { echo "No include/applets.h file"; exit 1; }
 apps="`
@@ -48,9 +56,9 @@ grep ^IF_ include/applets.h \
         b="busybox_${app}"
         test -f "$b" || continue
 
-        file=`grep -lF "bool \"$name" $(find -name '*.c') | xargs`
-        # so far all such items are in .c files; if need to check Config.* files:
-        #test "$file" || file=`grep -lF "bool \"$name" $(find -name 'Config.*') |  xargs`
+        file=`grep -l "bool \"$name[\" ]" $(find -name '*.c') | xargs`
+        # A few applets have their CONFIG items in Config.* files, not .c files:
+        test "$file" || file=`grep -l "bool \"$name[\" ]" $(find -name 'Config.*') | xargs`
         test "$file" || continue
         #echo "FILE:'$file'"
 
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 25ddf3172..76eccf1da 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -17,7 +17,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KLOGD
-//config:       bool "klogd (5.5 kb)"
+//config:       bool "klogd (5.7 kb)"
 //config:       default y
 //config:       help
 //config:       klogd is a utility which intercepts and logs all
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 1e0384c09..4d692d6fc 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGGER
-//config:       bool "logger (6.4 kb)"
+//config:       bool "logger (6.3 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index da552e087..ea41fc0c8 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGREAD
-//config:       bool "logread (6 kb)"
+//config:       bool "logread (4.8 kb)"
 //config:       default y
 //WRONG: it should be compilable without SYSLOG=y:
 //WRONG:        depends on FEATURE_IPC_SYSLOG
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 5630d97fc..f12359476 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -13,7 +13,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SYSLOGD
-//config:       bool "syslogd (12 kb)"
+//config:       bool "syslogd (13 kb)"
 //config:       default y
 //config:       help
 //config:       The syslogd utility is used to record logs of all the
diff --git a/testsuite/bc.tests b/testsuite/bc.tests
new file mode 100755
index 000000000..3fde60a2c
--- /dev/null
+++ b/testsuite/bc.tests
@@ -0,0 +1,314 @@
+#!/bin/sh
+# Copyright 2018 by Denys Vlasenko
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "test name" "command" "expected result" "file input" "stdin"
+
+testing "bc comment" \
+        "bc" \
+        "3\n" \
+        "" "1 /* comment */ + 2"
+
+testing "bc /*/ is not a closed comment" \
+        "bc" \
+        "4\n" \
+        "" "1 /*/ + 2 */ + 3"
+
+# this needs interactive testing
+testing "bc comment with \"" \
+        "bc" \
+        "3\n" \
+        "" "1 /* \" */ + 2"
+
+# this needs interactive testing
+testing "bc \"string/*\" is not a comment" \
+        "bc" \
+        "string/*9\n" \
+        "" "\"string/*\";9"
+
+testing "bc comment 3: unterminated #comment" \
+        "bc" \
+        "" \
+        "" "#foo"  # no trailing newline
+
+testing "bc backslash 1" \
+        "bc" \
+        "3\n" \
+        "" "1 \\\\\n + 2"
+
+testing "bc string 1" \
+        "bc" \
+        "STR\n" \
+        "" "\"STR\n\""
+
+testing "bc read() 4<EOF>" \
+        "bc input" \
+        "4\n" \
+        "read();halt" "4"
+
+testing "bc read()^2" \
+        "bc input" \
+        "16\n" \
+        "read()^2;halt" "4\n"
+
+testing "bc read()*read()" \
+        "bc input" \
+        "20\n" \
+        "read()*read();halt" "4\n5"
+
+testing "bc if 0 else" \
+        "bc" \
+        "2\n9\n" \
+        "" "if (0) 1 else 2; 9"
+
+testing "bc if 1 else" \
+        "bc" \
+        "1\n9\n" \
+        "" "if (1) 1 else 2; 9"
+
+testing "bc if 1 if 1 else else" \
+        "bc" \
+        "1\n9\n" \
+        "" "if (1) if (1) 1 else 2 else 3; 9"
+
+testing "bc if 0 else if 1" \
+        "bc" \
+        "2\n9\n" \
+        "" "if (0) 1 else if (1) 2; 9"
+
+testing "bc for (;;)" \
+        "bc" \
+        "2\n3\n2\n9\n" \
+        "" "i=2; for (;;) { 2; if(--i==0) break; 3; }; 9"
+
+testing "bc for (;cond;)" \
+        "bc" \
+        "1\n2\n3\n9\n" \
+        "" "i=0; for(;i<3;)++i; 9"
+
+testing "bc for (;cond;upd)" \
+        "bc" \
+        "1\n2\n3\n9\n" \
+        "" "i=1; for(;i<4;i++)i; 9"
+
+testing "bc for (init;cond;upd)" \
+        "bc" \
+        "1\n2\n3\n9\n" \
+        "" "for(i=1;i<4;i++)i; 9"
+
+testing "bc for (;;) {break}" \
+        "bc" \
+        "2\n9\n" \
+        "" "for (;;) {2;break}; 9"
+
+testing "bc define {return}" \
+        "bc" \
+        "0\n9\n" \
+        "" "define w() {return}\nw();9"
+
+testing "bc define auto" \
+        "bc" \
+        "8\n9\n" \
+        "" "define w() { auto z; return 8; }; w(); 9"
+
+testing "bc define auto array same name" \
+        "bc" \
+        "8\n9\n" \
+        "" "define w(x) { auto x[]; return x; }; w(8); 9"
+
+testing "bc define with body on next line" \
+        "bc" \
+        "8\n9\n" \
+        "" "define w()\n{ auto z; return 8; }\nw()\n9"
+
+testing "bc void function" \
+        "bc" \
+        "void9\n" \
+        "" "define void w() {print \"void\"}\nw()\n9"
+
+# Extra POSIX compat - GNU bc does not allow this
+testing "bc function named 'void'" \
+        "bc" \
+        "void0\n9\n" \
+        "" "define void() {print \"void\"}\nvoid()\n9"
+
+# Extra POSIX compat - GNU bc does not allow this
+testing "bc variable named 'void'" \
+        "bc" \
+        "6\n9\n" \
+        "" "void=6\nvoid\n9"
+
+testing "bc if(cond)<NL>" \
+        "bc" \
+        "9\n" \
+        "" "if(0)\n3\n9"
+
+testing "bc if(cond) stmt else<NL>" \
+        "bc" \
+        "4\n9\n" \
+        "" "if(0)3 else\n4\n9"
+
+testing "bc while(cond)<NL>" \
+        "bc" \
+        "8\n7\n6\n5\n4\n3\n2\n1\n9\n" \
+        "" "i=9;while(--i)\ni\n9"
+
+testing "bc ifz does not match if keyword" \
+        "bc" \
+        "1\n2\n2\n3\n" \
+        "" "ifz=1;ifz\n++ifz;ifz++\nifz"
+
+# had parse error on "f()-N"
+testing "bc -l 'e(0)-2'" \
+        "bc -l" \
+        "-1.00000000000000000000\n" \
+        "" "e(0)-2"
+
+testing "bc (!a&&b)" \
+        "bc" \
+        "0\n" \
+        "" "(!a&&b)"
+
+# check that dc code is not messing this up (no NUL printing!)
+testing "bc print \"\"" \
+        "bc" \
+        "" \
+        "" "print \"\""
+
+testing "bc print 1,2,3" \
+        "bc" \
+        "123" \
+        "" "print 1,2,3"
+
+testing "bc { print 1 }" \
+        "bc" \
+        "1" \
+        "" "{ print 1 }"
+
+testing "bc nested loops and breaks" \
+        "bc" \
+        "\
+11
+21
+31
+22
+12
+99
+" \
+        "" "\
+if(1) {
+        11
+        while(1) {
+                21
+                while(1) {
+                        31
+                        break
+                        32
+                }
+                22
+                break
+                23
+        }
+        12
+} else {
+        88
+}
+99
+"
+
+testing "bc continue in if" \
+        "bc" \
+        "\
+11
+21
+11
+31
+99
+" \
+        "" "\
+i=2
+while(i--) {
+        11
+        if(i) {
+                21
+                continue
+                22
+        } else {
+                31
+                continue
+        32
+        }
+        12
+}
+99
+"
+
+testing "bc continue in for" \
+        "bc" \
+        "\
+1
+77
+2
+99
+" \
+        "" "\
+for(i=1; i<3; i++) {
+    i
+    if(i==2) continue
+    77
+}
+99
+"
+
+testing "bc ibase" \
+        "bc" \
+        "99\n1295\n1224\n" \
+        "" "a=ZZ;a;ibase=36;a=ZZ;a;ibase=Z;a=ZZ;a"
+
+testing "bc parsing of numbers" \
+        "bc 2>&1 | bc 2>&1 | md5sum 2>&1" \
+        "465d8c01308d0863b6f5669e8a1c69fb  -\n" \
+        "" '
+for (b = 2; b <= 16; ++b) {
+        if (b == 10) continue
+        obase = 10
+        print "ibase = A; ibase = ", b, "\n"
+        obase = b
+        for (i = 0; i <= 65536; ++i) {
+                i
+                print "0.", i, "\n"
+                print "1.", i, "\n"
+                print i, ".", i, "\n"
+        }
+}'
+
+testing "bc printing of numbers" \
+        "bc 2>&1 | bc 2>&1 | md5sum 2>&1" \
+        "d884b35d251ca096410712743aeafb9e  -\n" \
+        "" '
+for (b = 2; b <= 101; ++b) {
+        if (b == 10) continue
+        s = b * b
+        print "obase = ", b, "\n"
+        for (i = 0; i <= s; ++i) {
+                i
+                print "0.", i, "\n"
+                print "1.", i, "\n"
+                print i, ".", i, "\n"
+        }
+        2189432174861923048671023498128347619023487610234689172304.192748960128745108927461089237469018723460
+}'
+
+for f in bc*.bc; do
+        r="`basename "$f" .bc`_results.txt"
+        test -f "$r" || continue
+        # testing "test name" "command" "expected result" "file input" "stdin"
+        testing "bc -lq $f" \
+                "{ { bc -lq $f 2>&1; echo E:\$? >&2; } | diff -u - $r; echo E:\$?; } 2>&1" \
+                "E:0\nE:0\n" \
+                "" ""
+done
+
+exit $FAILCOUNT
diff --git a/testsuite/bc_add.bc b/testsuite/bc_add.bc
new file mode 100644
index 000000000..ee03b4bb6
--- /dev/null
+++ b/testsuite/bc_add.bc
@@ -0,0 +1,26 @@
+0 + 0
+0 + 1
+1 + 1
+1 + 0
+2 + 5
+237 + 483
+999 + 999
+2374623 + 324869356734856
+2378639084586723980562 + 23468729367839
+37298367203972395108367910823465293084561329084561390845613409516734503870691837451 + 785621394067928346918023476190834672198467134908618723249671349062187346898241093486139046139084613490817356023871869102746182749061872609129847
+1.1 + 0
+0 + 1.1
+457283.731284923576 + 37842934672834.3874629385672354
+1.0 + 0.1
+3746289134067138046 + 0.138375863945672398456712389456273486293
+-1 + -1
+-4 + -15
+-1346782 + -1287904651762468913476
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999995 + 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999899999999999999999999999999999999999999999999999999999999999999 + 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+99999999999999999999999999999999999989999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+-1889985797 + 2012747315
+0 + -14338.391079082
+-2422297 + 1.3134942556
diff --git a/testsuite/bc_add_results.txt b/testsuite/bc_add_results.txt
new file mode 100644
index 000000000..c3b4d6d2a
--- /dev/null
+++ b/testsuite/bc_add_results.txt
@@ -0,0 +1,38 @@
+0
+1
+2
+1
+7
+720
+1998
+324869359109479
+2378639108055453348401
+78562139406792834691802347619083467219846713490861872324967138636055\
+45508706362018540498696043776980521464405852627147161556994835657433\
+00967298
+1.1
+1.1
+37842935130118.1187478621432354
+1.1
+3746289134067138046.138375863945672398456712389456273486293
+-2
+-19
+-1287904651762470260258
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000009999
+99999999999999999999999999999999999999999999999999999999999.99999999\
+99999999999999999999999999999999999999999999999999000000000000000000\
+00000000000000000000000000000000000000009999
+99999999999999999999999999999999999990000000000000000000000.00000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000009999
+122761518
+-14338.391079082
+-2422295.6865057444
diff --git a/testsuite/bc_arctangent.bc b/testsuite/bc_arctangent.bc
new file mode 100644
index 000000000..f665ea90b
--- /dev/null
+++ b/testsuite/bc_arctangent.bc
@@ -0,0 +1,26 @@
+a(.267)
+a(1)
+scale = 64
+a(.267)
+a(1)
+scale = 100
+a(.267)
+a(1)
+scale = 20
+a(0)
+a(.5)
+a(0.577350269189625764509148780501)
+a(1.5)
+a(1.7320508075688772935274463415)
+a(2)
+a(3)
+a(1000)
+a(-.5)
+a(-0.577350269189625764509148780501)
+a(-1.5)
+a(-1.7320508075688772935274463415)
+a(-2)
+a(-3)
+a(-1000)
+a(-3249917614.2821897119)
+a(-694706362.1974670468)
diff --git a/testsuite/bc_arctangent_results.txt b/testsuite/bc_arctangent_results.txt
new file mode 100644
index 000000000..e77c63779
--- /dev/null
+++ b/testsuite/bc_arctangent_results.txt
@@ -0,0 +1,25 @@
+.26091356923294057959
+.78539816339744830961
+.2609135692329405795967852677779865639774740239882445822329882917
+.7853981633974483096156608458198757210492923498437764552437361480
+.2609135692329405795967852677779865639774740239882445822329882917230\
+650591934644905491823044536954978
+.7853981633974483096156608458198757210492923498437764552437361480769\
+541015715522496570087063355292669
+0
+.46364760900080611621
+.52359877559829887307
+.98279372324732906798
+1.04719755119659774615
+1.10714871779409050301
+1.24904577239825442582
+1.56979632712822975256
+-.46364760900080611621
+-.52359877559829887307
+-.98279372324732906798
+-1.04719755119659774615
+-1.10714871779409050301
+-1.24904577239825442582
+-1.56979632712822975256
+-1.57079632648719651151
+-1.57079632535543952711
diff --git a/testsuite/bc_array.bc b/testsuite/bc_array.bc
new file mode 100644
index 000000000..3bb680178
--- /dev/null
+++ b/testsuite/bc_array.bc
@@ -0,0 +1,35 @@
+#! /usr/bin/bc -q
+
+define z(a[]) {
+        for (i = 0; i < l; ++i) {
+                a[i]
+        }
+}
+
+define x(a[]) {
+
+        for (i = 0; i < l; ++i) {
+                a[i] = -i
+        }
+
+        z(a[])
+}
+
+for (i = 0; i < 101; ++i) {
+        a[i] = i
+}
+
+a[104] = 204
+
+l = length(a[])
+
+for (i = 0; i <= l; ++i) {
+        a[i]
+}
+
+z(a[])
+x(a[])
+z(a[])
+l
+
+halt
diff --git a/testsuite/bc_array_results.txt b/testsuite/bc_array_results.txt
new file mode 100644
index 000000000..a757b7fb5
--- /dev/null
+++ b/testsuite/bc_array_results.txt
@@ -0,0 +1,426 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+0
+0
+0
+204
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+0
+0
+0
+204
+0
+0
+-1
+-2
+-3
+-4
+-5
+-6
+-7
+-8
+-9
+-10
+-11
+-12
+-13
+-14
+-15
+-16
+-17
+-18
+-19
+-20
+-21
+-22
+-23
+-24
+-25
+-26
+-27
+-28
+-29
+-30
+-31
+-32
+-33
+-34
+-35
+-36
+-37
+-38
+-39
+-40
+-41
+-42
+-43
+-44
+-45
+-46
+-47
+-48
+-49
+-50
+-51
+-52
+-53
+-54
+-55
+-56
+-57
+-58
+-59
+-60
+-61
+-62
+-63
+-64
+-65
+-66
+-67
+-68
+-69
+-70
+-71
+-72
+-73
+-74
+-75
+-76
+-77
+-78
+-79
+-80
+-81
+-82
+-83
+-84
+-85
+-86
+-87
+-88
+-89
+-90
+-91
+-92
+-93
+-94
+-95
+-96
+-97
+-98
+-99
+-100
+-101
+-102
+-103
+-104
+0
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+0
+0
+0
+204
+0
+105
diff --git a/testsuite/bc_arrays.bc b/testsuite/bc_arrays.bc
new file mode 100644
index 000000000..26a284b8d
--- /dev/null
+++ b/testsuite/bc_arrays.bc
@@ -0,0 +1,10 @@
+a[0] = 1
+a[2-1] = 2
+
+a[0]+a[0]
+
+a[2-1]+a[2-1]
+
+a[5] = 2
+a[5.789]
+
diff --git a/testsuite/bc_arrays_results.txt b/testsuite/bc_arrays_results.txt
new file mode 100644
index 000000000..200035ffa
--- /dev/null
+++ b/testsuite/bc_arrays_results.txt
@@ -0,0 +1,3 @@
+2
+4
+2
diff --git a/testsuite/bc_bessel.bc b/testsuite/bc_bessel.bc
new file mode 100644
index 000000000..a52fa356b
--- /dev/null
+++ b/testsuite/bc_bessel.bc
@@ -0,0 +1,844 @@
+j(0, 0)
+j(0, .5)
+j(0, -.5)
+j(0, 1)
+j(0, -1)
+j(0, 1.5)
+j(0, -1.5)
+j(0, 1.74)
+j(0, -1.74)
+j(0, 2)
+j(0, -2)
+j(0, 3.2345)
+j(0, -3.2345)
+j(0, 100)
+j(0, -100)
+j(0, -.5)
+j(0, .5)
+j(0, -1)
+j(0, 1)
+j(0, -1.5)
+j(0, 1.5)
+j(0, -1.74)
+j(0, 1.74)
+j(0, -2)
+j(0, 2)
+j(0, -3.2345)
+j(0, 3.2345)
+j(0, -100)
+j(0, 100)
+j(.5, 0)
+j(.5, .5)
+j(.5, -.5)
+j(.5, 1)
+j(.5, -1)
+j(.5, 1.5)
+j(.5, -1.5)
+j(.5, 1.74)
+j(.5, -1.74)
+j(.5, 2)
+j(.5, -2)
+j(.5, 3.2345)
+j(.5, -3.2345)
+j(.5, 100)
+j(.5, -100)
+j(.5, -.5)
+j(.5, .5)
+j(.5, -1)
+j(.5, 1)
+j(.5, -1.5)
+j(.5, 1.5)
+j(.5, -1.74)
+j(.5, 1.74)
+j(.5, -2)
+j(.5, 2)
+j(.5, -3.2345)
+j(.5, 3.2345)
+j(.5, -100)
+j(.5, 100)
+j(-.5, 0)
+j(-.5, .5)
+j(-.5, -.5)
+j(-.5, 1)
+j(-.5, -1)
+j(-.5, 1.5)
+j(-.5, -1.5)
+j(-.5, 1.74)
+j(-.5, -1.74)
+j(-.5, 2)
+j(-.5, -2)
+j(-.5, 3.2345)
+j(-.5, -3.2345)
+j(-.5, 100)
+j(-.5, -100)
+j(-.5, -.5)
+j(-.5, .5)
+j(-.5, -1)
+j(-.5, 1)
+j(-.5, -1.5)
+j(-.5, 1.5)
+j(-.5, -1.74)
+j(-.5, 1.74)
+j(-.5, -2)
+j(-.5, 2)
+j(-.5, -3.2345)
+j(-.5, 3.2345)
+j(-.5, -100)
+j(-.5, 100)
+j(1, 0)
+j(1, .5)
+j(1, -.5)
+j(1, 1)
+j(1, -1)
+j(1, 1.5)
+j(1, -1.5)
+j(1, 1.74)
+j(1, -1.74)
+j(1, 2)
+j(1, -2)
+j(1, 3.2345)
+j(1, -3.2345)
+j(1, 100)
+j(1, -100)
+j(1, -.5)
+j(1, .5)
+j(1, -1)
+j(1, 1)
+j(1, -1.5)
+j(1, 1.5)
+j(1, -1.74)
+j(1, 1.74)
+j(1, -2)
+j(1, 2)
+j(1, -3.2345)
+j(1, 3.2345)
+j(1, -100)
+j(1, 100)
+j(-1, 0)
+j(-1, .5)
+j(-1, -.5)
+j(-1, 1)
+j(-1, -1)
+j(-1, 1.5)
+j(-1, -1.5)
+j(-1, 1.74)
+j(-1, -1.74)
+j(-1, 2)
+j(-1, -2)
+j(-1, 3.2345)
+j(-1, -3.2345)
+j(-1, 100)
+j(-1, -100)
+j(-1, -.5)
+j(-1, .5)
+j(-1, -1)
+j(-1, 1)
+j(-1, -1.5)
+j(-1, 1.5)
+j(-1, -1.74)
+j(-1, 1.74)
+j(-1, -2)
+j(-1, 2)
+j(-1, -3.2345)
+j(-1, 3.2345)
+j(-1, -100)
+j(-1, 100)
+j(1.5, 0)
+j(1.5, .5)
+j(1.5, -.5)
+j(1.5, 1)
+j(1.5, -1)
+j(1.5, 1.5)
+j(1.5, -1.5)
+j(1.5, 1.74)
+j(1.5, -1.74)
+j(1.5, 2)
+j(1.5, -2)
+j(1.5, 3.2345)
+j(1.5, -3.2345)
+j(1.5, 100)
+j(1.5, -100)
+j(1.5, -.5)
+j(1.5, .5)
+j(1.5, -1)
+j(1.5, 1)
+j(1.5, -1.5)
+j(1.5, 1.5)
+j(1.5, -1.74)
+j(1.5, 1.74)
+j(1.5, -2)
+j(1.5, 2)
+j(1.5, -3.2345)
+j(1.5, 3.2345)
+j(1.5, -100)
+j(1.5, 100)
+j(-1.5, 0)
+j(-1.5, .5)
+j(-1.5, -.5)
+j(-1.5, 1)
+j(-1.5, -1)
+j(-1.5, 1.5)
+j(-1.5, -1.5)
+j(-1.5, 1.74)
+j(-1.5, -1.74)
+j(-1.5, 2)
+j(-1.5, -2)
+j(-1.5, 3.2345)
+j(-1.5, -3.2345)
+j(-1.5, 100)
+j(-1.5, -100)
+j(-1.5, -.5)
+j(-1.5, .5)
+j(-1.5, -1)
+j(-1.5, 1)
+j(-1.5, -1.5)
+j(-1.5, 1.5)
+j(-1.5, -1.74)
+j(-1.5, 1.74)
+j(-1.5, -2)
+j(-1.5, 2)
+j(-1.5, -3.2345)
+j(-1.5, 3.2345)
+j(-1.5, -100)
+j(-1.5, 100)
+j(1.74, 0)
+j(1.74, .5)
+j(1.74, -.5)
+j(1.74, 1)
+j(1.74, -1)
+j(1.74, 1.5)
+j(1.74, -1.5)
+j(1.74, 1.74)
+j(1.74, -1.74)
+j(1.74, 2)
+j(1.74, -2)
+j(1.74, 3.2345)
+j(1.74, -3.2345)
+j(1.74, 100)
+j(1.74, -100)
+j(1.74, -.5)
+j(1.74, .5)
+j(1.74, -1)
+j(1.74, 1)
+j(1.74, -1.5)
+j(1.74, 1.5)
+j(1.74, -1.74)
+j(1.74, 1.74)
+j(1.74, -2)
+j(1.74, 2)
+j(1.74, -3.2345)
+j(1.74, 3.2345)
+j(1.74, -100)
+j(1.74, 100)
+j(-1.74, 0)
+j(-1.74, .5)
+j(-1.74, -.5)
+j(-1.74, 1)
+j(-1.74, -1)
+j(-1.74, 1.5)
+j(-1.74, -1.5)
+j(-1.74, 1.74)
+j(-1.74, -1.74)
+j(-1.74, 2)
+j(-1.74, -2)
+j(-1.74, 3.2345)
+j(-1.74, -3.2345)
+j(-1.74, 100)
+j(-1.74, -100)
+j(-1.74, -.5)
+j(-1.74, .5)
+j(-1.74, -1)
+j(-1.74, 1)
+j(-1.74, -1.5)
+j(-1.74, 1.5)
+j(-1.74, -1.74)
+j(-1.74, 1.74)
+j(-1.74, -2)
+j(-1.74, 2)
+j(-1.74, -3.2345)
+j(-1.74, 3.2345)
+j(-1.74, -100)
+j(-1.74, 100)
+j(2, 0)
+j(2, .5)
+j(2, -.5)
+j(2, 1)
+j(2, -1)
+j(2, 1.5)
+j(2, -1.5)
+j(2, 1.74)
+j(2, -1.74)
+j(2, 2)
+j(2, -2)
+j(2, 3.2345)
+j(2, -3.2345)
+j(2, 100)
+j(2, -100)
+j(2, -.5)
+j(2, .5)
+j(2, -1)
+j(2, 1)
+j(2, -1.5)
+j(2, 1.5)
+j(2, -1.74)
+j(2, 1.74)
+j(2, -2)
+j(2, 2)
+j(2, -3.2345)
+j(2, 3.2345)
+j(2, -100)
+j(2, 100)
+j(-2, 0)
+j(-2, .5)
+j(-2, -.5)
+j(-2, 1)
+j(-2, -1)
+j(-2, 1.5)
+j(-2, -1.5)
+j(-2, 1.74)
+j(-2, -1.74)
+j(-2, 2)
+j(-2, -2)
+j(-2, 3.2345)
+j(-2, -3.2345)
+j(-2, 100)
+j(-2, -100)
+j(-2, -.5)
+j(-2, .5)
+j(-2, -1)
+j(-2, 1)
+j(-2, -1.5)
+j(-2, 1.5)
+j(-2, -1.74)
+j(-2, 1.74)
+j(-2, -2)
+j(-2, 2)
+j(-2, -3.2345)
+j(-2, 3.2345)
+j(-2, -100)
+j(-2, 100)
+j(3.2345, 0)
+j(3.2345, .5)
+j(3.2345, -.5)
+j(3.2345, 1)
+j(3.2345, -1)
+j(3.2345, 1.5)
+j(3.2345, -1.5)
+j(3.2345, 1.74)
+j(3.2345, -1.74)
+j(3.2345, 2)
+j(3.2345, -2)
+j(3.2345, 3.2345)
+j(3.2345, -3.2345)
+j(3.2345, 100)
+j(3.2345, -100)
+j(3.2345, -.5)
+j(3.2345, .5)
+j(3.2345, -1)
+j(3.2345, 1)
+j(3.2345, -1.5)
+j(3.2345, 1.5)
+j(3.2345, -1.74)
+j(3.2345, 1.74)
+j(3.2345, -2)
+j(3.2345, 2)
+j(3.2345, -3.2345)
+j(3.2345, 3.2345)
+j(3.2345, -100)
+j(3.2345, 100)
+j(-3.2345, 0)
+j(-3.2345, .5)
+j(-3.2345, -.5)
+j(-3.2345, 1)
+j(-3.2345, -1)
+j(-3.2345, 1.5)
+j(-3.2345, -1.5)
+j(-3.2345, 1.74)
+j(-3.2345, -1.74)
+j(-3.2345, 2)
+j(-3.2345, -2)
+j(-3.2345, 3.2345)
+j(-3.2345, -3.2345)
+j(-3.2345, 100)
+j(-3.2345, -100)
+j(-3.2345, -.5)
+j(-3.2345, .5)
+j(-3.2345, -1)
+j(-3.2345, 1)
+j(-3.2345, -1.5)
+j(-3.2345, 1.5)
+j(-3.2345, -1.74)
+j(-3.2345, 1.74)
+j(-3.2345, -2)
+j(-3.2345, 2)
+j(-3.2345, -3.2345)
+j(-3.2345, 3.2345)
+j(-3.2345, -100)
+j(-3.2345, 100)
+j(100, 0)
+j(100, .5)
+j(100, -.5)
+j(100, 1)
+j(100, -1)
+j(100, 1.5)
+j(100, -1.5)
+j(100, 1.74)
+j(100, -1.74)
+j(100, 2)
+j(100, -2)
+j(100, 3.2345)
+j(100, -3.2345)
+j(100, 100)
+j(100, -100)
+j(100, -.5)
+j(100, .5)
+j(100, -1)
+j(100, 1)
+j(100, -1.5)
+j(100, 1.5)
+j(100, -1.74)
+j(100, 1.74)
+j(100, -2)
+j(100, 2)
+j(100, -3.2345)
+j(100, 3.2345)
+j(100, -100)
+j(100, 100)
+j(-100, 0)
+j(-100, .5)
+j(-100, -.5)
+j(-100, 1)
+j(-100, -1)
+j(-100, 1.5)
+j(-100, -1.5)
+j(-100, 1.74)
+j(-100, -1.74)
+j(-100, 2)
+j(-100, -2)
+j(-100, 3.2345)
+j(-100, -3.2345)
+j(-100, 100)
+j(-100, -100)
+j(-100, -.5)
+j(-100, .5)
+j(-100, -1)
+j(-100, 1)
+j(-100, -1.5)
+j(-100, 1.5)
+j(-100, -1.74)
+j(-100, 1.74)
+j(-100, -2)
+j(-100, 2)
+j(-100, -3.2345)
+j(-100, 3.2345)
+j(-100, -100)
+j(-100, 100)
+j(-.5, 0)
+j(-.5, .5)
+j(-.5, -.5)
+j(-.5, 1)
+j(-.5, -1)
+j(-.5, 1.5)
+j(-.5, -1.5)
+j(-.5, 1.74)
+j(-.5, -1.74)
+j(-.5, 2)
+j(-.5, -2)
+j(-.5, 3.2345)
+j(-.5, -3.2345)
+j(-.5, 100)
+j(-.5, -100)
+j(-.5, -.5)
+j(-.5, .5)
+j(-.5, -1)
+j(-.5, 1)
+j(-.5, -1.5)
+j(-.5, 1.5)
+j(-.5, -1.74)
+j(-.5, 1.74)
+j(-.5, -2)
+j(-.5, 2)
+j(-.5, -3.2345)
+j(-.5, 3.2345)
+j(-.5, -100)
+j(-.5, 100)
+j(.5, 0)
+j(.5, .5)
+j(.5, -.5)
+j(.5, 1)
+j(.5, -1)
+j(.5, 1.5)
+j(.5, -1.5)
+j(.5, 1.74)
+j(.5, -1.74)
+j(.5, 2)
+j(.5, -2)
+j(.5, 3.2345)
+j(.5, -3.2345)
+j(.5, 100)
+j(.5, -100)
+j(.5, -.5)
+j(.5, .5)
+j(.5, -1)
+j(.5, 1)
+j(.5, -1.5)
+j(.5, 1.5)
+j(.5, -1.74)
+j(.5, 1.74)
+j(.5, -2)
+j(.5, 2)
+j(.5, -3.2345)
+j(.5, 3.2345)
+j(.5, -100)
+j(.5, 100)
+j(-1, 0)
+j(-1, .5)
+j(-1, -.5)
+j(-1, 1)
+j(-1, -1)
+j(-1, 1.5)
+j(-1, -1.5)
+j(-1, 1.74)
+j(-1, -1.74)
+j(-1, 2)
+j(-1, -2)
+j(-1, 3.2345)
+j(-1, -3.2345)
+j(-1, 100)
+j(-1, -100)
+j(-1, -.5)
+j(-1, .5)
+j(-1, -1)
+j(-1, 1)
+j(-1, -1.5)
+j(-1, 1.5)
+j(-1, -1.74)
+j(-1, 1.74)
+j(-1, -2)
+j(-1, 2)
+j(-1, -3.2345)
+j(-1, 3.2345)
+j(-1, -100)
+j(-1, 100)
+j(1, 0)
+j(1, .5)
+j(1, -.5)
+j(1, 1)
+j(1, -1)
+j(1, 1.5)
+j(1, -1.5)
+j(1, 1.74)
+j(1, -1.74)
+j(1, 2)
+j(1, -2)
+j(1, 3.2345)
+j(1, -3.2345)
+j(1, 100)
+j(1, -100)
+j(1, -.5)
+j(1, .5)
+j(1, -1)
+j(1, 1)
+j(1, -1.5)
+j(1, 1.5)
+j(1, -1.74)
+j(1, 1.74)
+j(1, -2)
+j(1, 2)
+j(1, -3.2345)
+j(1, 3.2345)
+j(1, -100)
+j(1, 100)
+j(-1.5, 0)
+j(-1.5, .5)
+j(-1.5, -.5)
+j(-1.5, 1)
+j(-1.5, -1)
+j(-1.5, 1.5)
+j(-1.5, -1.5)
+j(-1.5, 1.74)
+j(-1.5, -1.74)
+j(-1.5, 2)
+j(-1.5, -2)
+j(-1.5, 3.2345)
+j(-1.5, -3.2345)
+j(-1.5, 100)
+j(-1.5, -100)
+j(-1.5, -.5)
+j(-1.5, .5)
+j(-1.5, -1)
+j(-1.5, 1)
+j(-1.5, -1.5)
+j(-1.5, 1.5)
+j(-1.5, -1.74)
+j(-1.5, 1.74)
+j(-1.5, -2)
+j(-1.5, 2)
+j(-1.5, -3.2345)
+j(-1.5, 3.2345)
+j(-1.5, -100)
+j(-1.5, 100)
+j(1.5, 0)
+j(1.5, .5)
+j(1.5, -.5)
+j(1.5, 1)
+j(1.5, -1)
+j(1.5, 1.5)
+j(1.5, -1.5)
+j(1.5, 1.74)
+j(1.5, -1.74)
+j(1.5, 2)
+j(1.5, -2)
+j(1.5, 3.2345)
+j(1.5, -3.2345)
+j(1.5, 100)
+j(1.5, -100)
+j(1.5, -.5)
+j(1.5, .5)
+j(1.5, -1)
+j(1.5, 1)
+j(1.5, -1.5)
+j(1.5, 1.5)
+j(1.5, -1.74)
+j(1.5, 1.74)
+j(1.5, -2)
+j(1.5, 2)
+j(1.5, -3.2345)
+j(1.5, 3.2345)
+j(1.5, -100)
+j(1.5, 100)
+j(-1.74, 0)
+j(-1.74, .5)
+j(-1.74, -.5)
+j(-1.74, 1)
+j(-1.74, -1)
+j(-1.74, 1.5)
+j(-1.74, -1.5)
+j(-1.74, 1.74)
+j(-1.74, -1.74)
+j(-1.74, 2)
+j(-1.74, -2)
+j(-1.74, 3.2345)
+j(-1.74, -3.2345)
+j(-1.74, 100)
+j(-1.74, -100)
+j(-1.74, -.5)
+j(-1.74, .5)
+j(-1.74, -1)
+j(-1.74, 1)
+j(-1.74, -1.5)
+j(-1.74, 1.5)
+j(-1.74, -1.74)
+j(-1.74, 1.74)
+j(-1.74, -2)
+j(-1.74, 2)
+j(-1.74, -3.2345)
+j(-1.74, 3.2345)
+j(-1.74, -100)
+j(-1.74, 100)
+j(1.74, 0)
+j(1.74, .5)
+j(1.74, -.5)
+j(1.74, 1)
+j(1.74, -1)
+j(1.74, 1.5)
+j(1.74, -1.5)
+j(1.74, 1.74)
+j(1.74, -1.74)
+j(1.74, 2)
+j(1.74, -2)
+j(1.74, 3.2345)
+j(1.74, -3.2345)
+j(1.74, 100)
+j(1.74, -100)
+j(1.74, -.5)
+j(1.74, .5)
+j(1.74, -1)
+j(1.74, 1)
+j(1.74, -1.5)
+j(1.74, 1.5)
+j(1.74, -1.74)
+j(1.74, 1.74)
+j(1.74, -2)
+j(1.74, 2)
+j(1.74, -3.2345)
+j(1.74, 3.2345)
+j(1.74, -100)
+j(1.74, 100)
+j(-2, 0)
+j(-2, .5)
+j(-2, -.5)
+j(-2, 1)
+j(-2, -1)
+j(-2, 1.5)
+j(-2, -1.5)
+j(-2, 1.74)
+j(-2, -1.74)
+j(-2, 2)
+j(-2, -2)
+j(-2, 3.2345)
+j(-2, -3.2345)
+j(-2, 100)
+j(-2, -100)
+j(-2, -.5)
+j(-2, .5)
+j(-2, -1)
+j(-2, 1)
+j(-2, -1.5)
+j(-2, 1.5)
+j(-2, -1.74)
+j(-2, 1.74)
+j(-2, -2)
+j(-2, 2)
+j(-2, -3.2345)
+j(-2, 3.2345)
+j(-2, -100)
+j(-2, 100)
+j(2, 0)
+j(2, .5)
+j(2, -.5)
+j(2, 1)
+j(2, -1)
+j(2, 1.5)
+j(2, -1.5)
+j(2, 1.74)
+j(2, -1.74)
+j(2, 2)
+j(2, -2)
+j(2, 3.2345)
+j(2, -3.2345)
+j(2, 100)
+j(2, -100)
+j(2, -.5)
+j(2, .5)
+j(2, -1)
+j(2, 1)
+j(2, -1.5)
+j(2, 1.5)
+j(2, -1.74)
+j(2, 1.74)
+j(2, -2)
+j(2, 2)
+j(2, -3.2345)
+j(2, 3.2345)
+j(2, -100)
+j(2, 100)
+j(-3.2345, 0)
+j(-3.2345, .5)
+j(-3.2345, -.5)
+j(-3.2345, 1)
+j(-3.2345, -1)
+j(-3.2345, 1.5)
+j(-3.2345, -1.5)
+j(-3.2345, 1.74)
+j(-3.2345, -1.74)
+j(-3.2345, 2)
+j(-3.2345, -2)
+j(-3.2345, 3.2345)
+j(-3.2345, -3.2345)
+j(-3.2345, 100)
+j(-3.2345, -100)
+j(-3.2345, -.5)
+j(-3.2345, .5)
+j(-3.2345, -1)
+j(-3.2345, 1)
+j(-3.2345, -1.5)
+j(-3.2345, 1.5)
+j(-3.2345, -1.74)
+j(-3.2345, 1.74)
+j(-3.2345, -2)
+j(-3.2345, 2)
+j(-3.2345, -3.2345)
+j(-3.2345, 3.2345)
+j(-3.2345, -100)
+j(-3.2345, 100)
+j(3.2345, 0)
+j(3.2345, .5)
+j(3.2345, -.5)
+j(3.2345, 1)
+j(3.2345, -1)
+j(3.2345, 1.5)
+j(3.2345, -1.5)
+j(3.2345, 1.74)
+j(3.2345, -1.74)
+j(3.2345, 2)
+j(3.2345, -2)
+j(3.2345, 3.2345)
+j(3.2345, -3.2345)
+j(3.2345, 100)
+j(3.2345, -100)
+j(3.2345, -.5)
+j(3.2345, .5)
+j(3.2345, -1)
+j(3.2345, 1)
+j(3.2345, -1.5)
+j(3.2345, 1.5)
+j(3.2345, -1.74)
+j(3.2345, 1.74)
+j(3.2345, -2)
+j(3.2345, 2)
+j(3.2345, -3.2345)
+j(3.2345, 3.2345)
+j(3.2345, -100)
+j(3.2345, 100)
+j(-100, 0)
+j(-100, .5)
+j(-100, -.5)
+j(-100, 1)
+j(-100, -1)
+j(-100, 1.5)
+j(-100, -1.5)
+j(-100, 1.74)
+j(-100, -1.74)
+j(-100, 2)
+j(-100, -2)
+j(-100, 3.2345)
+j(-100, -3.2345)
+j(-100, 100)
+j(-100, -100)
+j(-100, -.5)
+j(-100, .5)
+j(-100, -1)
+j(-100, 1)
+j(-100, -1.5)
+j(-100, 1.5)
+j(-100, -1.74)
+j(-100, 1.74)
+j(-100, -2)
+j(-100, 2)
+j(-100, -3.2345)
+j(-100, 3.2345)
+j(-100, -100)
+j(-100, 100)
+j(100, 0)
+j(100, .5)
+j(100, -.5)
+j(100, 1)
+j(100, -1)
+j(100, 1.5)
+j(100, -1.5)
+j(100, 1.74)
+j(100, -1.74)
+j(100, 2)
+j(100, -2)
+j(100, 3.2345)
+j(100, -3.2345)
+j(100, 100)
+j(100, -100)
+j(100, -.5)
+j(100, .5)
+j(100, -1)
+j(100, 1)
+j(100, -1.5)
+j(100, 1.5)
+j(100, -1.74)
+j(100, 1.74)
+j(100, -2)
+j(100, 2)
+j(100, -3.2345)
+j(100, 3.2345)
+j(100, -100)
+j(100, 100)
+j(3, 0.75)
+scale = 0; j(40, 0.75)
+halt
\ No newline at end of file
diff --git a/testsuite/bc_bessel_results.txt b/testsuite/bc_bessel_results.txt
new file mode 100644
index 000000000..4bbb3c86b
--- /dev/null
+++ b/testsuite/bc_bessel_results.txt
@@ -0,0 +1,843 @@
+1.00000000000000000000
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+1.00000000000000000000
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+1.00000000000000000000
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+0
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+0
+.00256372999458724407
+-.00256372999458724407
+.01956335398266840591
+-.01956335398266840591
+.06096395114113963064
+-.06096395114113963064
+.09049051186641988137
+-.09049051186641988137
+.12894324947440205109
+-.12894324947440205109
+.34859607875298354805
+-.34859607875298354805
+.07628420172033194340
+-.07628420172033194340
+-.00256372999458724407
+.00256372999458724407
+-.01956335398266840591
+.01956335398266840591
+-.06096395114113963064
+.06096395114113963064
+-.09049051186641988137
+.09049051186641988137
+-.12894324947440205109
+.12894324947440205109
+-.34859607875298354805
+.34859607875298354805
+-.07628420172033194340
+.07628420172033194340
+0
+-.00256372999458724407
+.00256372999458724407
+-.01956335398266840591
+.01956335398266840591
+-.06096395114113963064
+.06096395114113963064
+-.09049051186641988137
+.09049051186641988137
+-.12894324947440205109
+.12894324947440205109
+-.34859607875298354805
+.34859607875298354805
+-.07628420172033194340
+.07628420172033194340
+.00256372999458724407
+-.00256372999458724407
+.01956335398266840591
+-.01956335398266840591
+.06096395114113963064
+-.06096395114113963064
+.09049051186641988137
+-.09049051186641988137
+.12894324947440205109
+-.12894324947440205109
+.34859607875298354805
+-.34859607875298354805
+.07628420172033194340
+-.07628420172033194340
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+1.00000000000000000000
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+1.00000000000000000000
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+.93846980724081290422
+.93846980724081290422
+.76519768655796655144
+.76519768655796655144
+.51182767173591812874
+.51182767173591812874
+.37483214773176892693
+.37483214773176892693
+.22389077914123566805
+.22389077914123566805
+-.32896462175888702221
+-.32896462175888702221
+.01998585030422312242
+.01998585030422312242
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+0
+.24226845767487388638
+-.24226845767487388638
+.44005058574493351595
+-.44005058574493351595
+.55793650791009964199
+-.55793650791009964199
+.57976044202797131452
+-.57976044202797131452
+.57672480775687338720
+-.57672480775687338720
+.24741588607612652213
+-.24741588607612652213
+-.07714535201411215803
+.07714535201411215803
+-.24226845767487388638
+.24226845767487388638
+-.44005058574493351595
+.44005058574493351595
+-.55793650791009964199
+.55793650791009964199
+-.57976044202797131452
+.57976044202797131452
+-.57672480775687338720
+.57672480775687338720
+-.24741588607612652213
+.24741588607612652213
+.07714535201411215803
+-.07714535201411215803
+0
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+0
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+.03060402345868264130
+.03060402345868264130
+.11490348493190048046
+.11490348493190048046
+.23208767214421472723
+.23208767214421472723
+.29155916494406017021
+.29155916494406017021
+.35283402861563771915
+.35283402861563771915
+.48195017505993913050
+.48195017505993913050
+-.02152875734450536558
+-.02152875734450536558
+0
+-.00256372999458724407
+.00256372999458724407
+-.01956335398266840591
+.01956335398266840591
+-.06096395114113963064
+.06096395114113963064
+-.09049051186641988137
+.09049051186641988137
+-.12894324947440205109
+.12894324947440205109
+-.34859607875298354805
+.34859607875298354805
+-.07628420172033194340
+.07628420172033194340
+.00256372999458724407
+-.00256372999458724407
+.01956335398266840591
+-.01956335398266840591
+.06096395114113963064
+-.06096395114113963064
+.09049051186641988137
+-.09049051186641988137
+.12894324947440205109
+-.12894324947440205109
+.34859607875298354805
+-.34859607875298354805
+.07628420172033194340
+-.07628420172033194340
+0
+.00256372999458724407
+-.00256372999458724407
+.01956335398266840591
+-.01956335398266840591
+.06096395114113963064
+-.06096395114113963064
+.09049051186641988137
+-.09049051186641988137
+.12894324947440205109
+-.12894324947440205109
+.34859607875298354805
+-.34859607875298354805
+.07628420172033194340
+-.07628420172033194340
+-.00256372999458724407
+.00256372999458724407
+-.01956335398266840591
+.01956335398266840591
+-.06096395114113963064
+.06096395114113963064
+-.09049051186641988137
+.09049051186641988137
+-.12894324947440205109
+.12894324947440205109
+-.34859607875298354805
+.34859607875298354805
+-.07628420172033194340
+.07628420172033194340
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+.09636667329586155967
+.09636667329586155967
+.00848438342327410884
+0
diff --git a/testsuite/bc_boolean.bc b/testsuite/bc_boolean.bc
new file mode 100644
index 000000000..021afc5f9
--- /dev/null
+++ b/testsuite/bc_boolean.bc
@@ -0,0 +1,181 @@
+!0
+!1
+!(-129)
+4 && 5
+4 && 0
+0 && 5
+4 && 5 && 7
+4 && 0 && 7
+0 && 5 && 7
+4 && 5 && 0
+0 && 0 && 7
+4 && 0 && 0
+0 && 5 && 0
+!4 && 5
+!4 && 0
+!0 && 5
+4 && !5
+4 && !0
+0 && !5
+!4 && 5 && 7
+!4 && 0 && 7
+!0 && 5 && 7
+!4 && 5 && 0
+!0 && 0 && 7
+!4 && 0 && 0
+!0 && 5 && 0
+4 && !5 && 7
+4 && !0 && 7
+0 && !5 && 7
+4 && !5 && 0
+0 && !0 && 7
+4 && !0 && 0
+0 && !5 && 0
+4 && 5 && !7
+4 && 0 && !7
+0 && 5 && !7
+4 && 5 && !0
+0 && 0 && !7
+4 && 0 && !0
+0 && 5 && !0
+!4 && !5 && 7
+!4 && !0 && 7
+!0 && !5 && 7
+!4 && !5 && 0
+!0 && !0 && 7
+!4 && !0 && 0
+!0 && !5 && 0
+!4 && 5 && !7
+!4 && 0 && !7
+!0 && 5 && !7
+!4 && 5 && !0
+!0 && 0 && !7
+!4 && 0 && !0
+!0 && 5 && !0
+4 && !5 && !7
+4 && !0 && !7
+0 && !5 && !7
+4 && !5 && !0
+0 && !0 && !7
+4 && !0 && !0
+0 && !5 && !0
+!4 && !5 && !7
+!4 && !0 && !7
+!0 && !5 && !7
+!4 && !5 && !0
+!0 && !0 && !7
+!4 && !0 && !0
+!0 && !5 && !0
+3 < 4 && 7
+3 && 4 >= 4
+3 > 4 && 7
+3 && 4 >= 5
+3 < 4 && 0
+0 && 4 >= 4
+3 > 4 && 0
+0 && 4 >= 5
+3 > 4 && 0
+0 && 4 < 4
+3 >= 4 && 0
+0 && 4 >= 5
+3 < 4 && 7
+3 && 4 >= 4
+3 > 4 && 7 > 4
+3 >= 2 && 4 >= 5
+3 < 4 && 0 > -1
+4 < 3 && 4 >= 4
+3 > 4 && 3 == 3
+3 != 3 && 4 >= 5
+3 > 4 && 0 > 1
+0 >= 0 && 4 < 4
+3 >= 4 && 0 >= 1
+0 <= -1 && 4 >= 5
+4 || 5
+4 || 0
+0 || 5
+4 || 5 || 7
+4 || 0 || 7
+0 || 5 || 7
+4 || 5 || 0
+0 || 0 || 7
+4 || 0 || 0
+0 || 5 || 0
+!4 || 5
+!4 || 0
+!0 || 5
+4 || !5
+4 || !0
+0 || !5
+!4 || 5 || 7
+!4 || 0 || 7
+!0 || 5 || 7
+!4 || 5 || 0
+!0 || 0 || 7
+!4 || 0 || 0
+!0 || 5 || 0
+4 || !5 || 7
+4 || !0 || 7
+0 || !5 || 7
+4 || !5 || 0
+0 || !0 || 7
+4 || !0 || 0
+0 || !5 || 0
+4 || 5 || !7
+4 || 0 || !7
+0 || 5 || !7
+4 || 5 || !0
+0 || 0 || !7
+4 || 0 || !0
+0 || 5 || !0
+!4 || !5 || 7
+!4 || !0 || 7
+!0 || !5 || 7
+!4 || !5 || 0
+!0 || !0 || 7
+!4 || !0 || 0
+!0 || !5 || 0
+!4 || 5 || !7
+!4 || 0 || !7
+!0 || 5 || !7
+!4 || 5 || !0
+!0 || 0 || !7
+!4 || 0 || !0
+!0 || 5 || !0
+4 || !5 || !7
+4 || !0 || !7
+0 || !5 || !7
+4 || !5 || !0
+0 || !0 || !7
+4 || !0 || !0
+0 || !5 || !0
+!4 || !5 || !7
+!4 || !0 || !7
+!0 || !5 || !7
+!4 || !5 || !0
+!0 || !0 || !7
+!4 || !0 || !0
+!0 || !5 || !0
+3 < 4 || 7
+3 || 4 >= 4
+3 > 4 || 7
+3 || 4 >= 5
+3 < 4 || 0
+0 || 4 >= 4
+3 > 4 || 0
+0 || 4 >= 5
+3 > 4 || 0
+0 || 4 < 4
+3 >= 4 || 0
+0 || 4 >= 5
+3 < 4 || 7
+3 || 4 >= 4
+3 > 4 || 7 > 4
+3 >= 2 || 4 >= 5
+3 < 4 || 0 > -1
+4 < 3 || 4 >= 4
+3 > 4 || 3 == 3
+3 != 3 || 4 >= 5
+3 > 4 || 0 > 1
+0 >= 0 || 4 < 4
+3 >= 4 || 0 >= 1
+0 <= -1 || 4 >= 5
diff --git a/testsuite/bc_boolean_results.txt b/testsuite/bc_boolean_results.txt
new file mode 100644
index 000000000..ea59389c0
--- /dev/null
+++ b/testsuite/bc_boolean_results.txt
@@ -0,0 +1,181 @@
+1
+0
+0
+1
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+1
+0
+0
+0
+1
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+1
+1
+1
+0
+1
+1
+1
+1
+1
+0
+1
+1
+1
+1
+1
+1
+1
+0
+1
+1
+1
+1
+0
+1
+1
+1
+1
+1
+0
+1
+1
+1
+1
+0
+1
+1
+1
+1
+1
+1
+1
+0
+1
+1
+1
+1
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+0
+0
+1
+0
+0
diff --git a/testsuite/bc_cosine.bc b/testsuite/bc_cosine.bc
new file mode 100644
index 000000000..9e67df4c6
--- /dev/null
+++ b/testsuite/bc_cosine.bc
@@ -0,0 +1,44 @@
+scale = 25
+p = 4 * a(1)
+scale = 20
+c(0)
+c(0.5)
+c(1)
+c(2)
+c(3)
+c(-0.5)
+c(-1)
+c(-2)
+c(-3)
+c(p / 7)
+c(-p / 7)
+c(p / 4)
+c(-p / 4)
+c(p / 3)
+c(-p / 3)
+c(p / 2)
+c(-p / 2)
+c(3 * p / 4)
+c(3 * -p / 4)
+c(p)
+c(-p)
+c(3 * p / 2)
+c(3 * -p / 2)
+c(7 * p / 4)
+c(7 * -p / 4)
+c(13 * p / 4)
+c(13 * -p / 4)
+c(2 * p)
+c(2 * -p)
+c(131231)
+c(-131231)
+c(859799894.3562378245)
+c(859799894.3562378245)
+c(4307371)
+c(3522556.3323810191)
+c(44961070)
+c(6918619.1574479809)
+c(190836996.2180244164)
+c(34934)
+c(2483599)
+c(13720376)
diff --git a/testsuite/bc_cosine_results.txt b/testsuite/bc_cosine_results.txt
new file mode 100644
index 000000000..43d640f00
--- /dev/null
+++ b/testsuite/bc_cosine_results.txt
@@ -0,0 +1,41 @@
+1.00000000000000000000
+.87758256189037271611
+.54030230586813971740
+-.41614683654714238699
+-.98999249660044545727
+.87758256189037271611
+.54030230586813971740
+-.41614683654714238699
+-.98999249660044545727
+.90096886790241912623
+.90096886790241912623
+.70710678118654752440
+.70710678118654752440
+.50000000000000000000
+.50000000000000000000
+0
+0
+-.70710678118654752439
+-.70710678118654752439
+-1.00000000000000000000
+-1.00000000000000000000
+0
+0
+.70710678118654752439
+.70710678118654752439
+-.70710678118654752440
+-.70710678118654752440
+1.00000000000000000000
+1.00000000000000000000
+.92427123447397657316
+.92427123447397657316
+-.04198856352825241211
+-.04198856352825241211
+-.75581969921220636368
+-.01644924448939844182
+-.97280717522127222547
+-.92573947460230585966
+-.14343824233852988038
+.87259414746802343203
+.93542606623067050616
+-.52795540572178251550
diff --git a/testsuite/bc_decimal.bc b/testsuite/bc_decimal.bc
new file mode 100644
index 000000000..9b1788c67
--- /dev/null
+++ b/testsuite/bc_decimal.bc
@@ -0,0 +1,36 @@
+0
+0.0
+.00000
+000000000000000000000000.00000000000000000000000
+000000000000000000000000000135482346782356
+000000000000000000000000002
+1
+11
+123
+7505
+1023468723275435238491972521917846
+4343472432431705867392073517038270398027352709027389273920739037937960379637893607893607893670530278200795207952702873892786172916728961783907893607418973587857386079679267926737520730925372983782793652793
+-1
+-203
+-57
+-18586
+-31378682943772818461924738352952347258
+-823945628745673589495067238723986520375698237620834674509627345273096287563846592384526349872634895763257893467523987578690283762897568459072348758071071087813501875908127359018715023841710239872301387278
+.123521346523546
+0.1245923756273856
+-.1024678456387
+-0.8735863475634587
+4.0
+-6.0
+234237468293576.000000000000000000000000000000
+23987623568943567.00000000000000000005677834650000000000000
+23856934568940675.000000000000000435676782300000000000000456784
+77567648698496.000000000000000000587674750000000000458563800000000000000
+2348672354968723.2374823546000000000003256987394502346892435623870000000034578
+-2354768.000000000000000000000000000000000000
+-96739874567.000000000347683456
+-3764568345.000000000004573845000000347683460
+-356784356.934568495770004586495678300000000
+74325437345273852773827101738273127312738521733017537073520735207307570358738257390761276072160719802671980267018728630178.7082681027680521760217867841276127681270867827821768173178207830710978017738178678012767377058785378278207385237085237803278203782037237582795870
+-756752732785273851273728537852738257837283678965738527385272983678372867327835672967385278372637862738627836279863782673862783670.71738178361738718367186378610738617836781603760178367018603760178107735278372832783728367826738627836278378260736270367362073867097307925
+9812734012837410982345719208345712908357412903587192048571920458712.23957182459817249058172945781
diff --git a/testsuite/bc_decimal_results.txt b/testsuite/bc_decimal_results.txt
new file mode 100644
index 000000000..275d431c6
--- /dev/null
+++ b/testsuite/bc_decimal_results.txt
@@ -0,0 +1,51 @@
+0
+0
+0
+0
+135482346782356
+2
+1
+11
+123
+7505
+1023468723275435238491972521917846
+43434724324317058673920735170382703980273527090273892739207390379379\
+60379637893607893607893670530278200795207952702873892786172916728961\
+78390789360741897358785738607967926792673752073092537298378279365279\
+3
+-1
+-203
+-57
+-18586
+-31378682943772818461924738352952347258
+-8239456287456735894950672387239865203756982376208346745096273452730\
+96287563846592384526349872634895763257893467523987578690283762897568\
+45907234875807107108781350187590812735901871502384171023987230138727\
+8
+.123521346523546
+.1245923756273856
+-.1024678456387
+-.8735863475634587
+4.0
+-6.0
+234237468293576.000000000000000000000000000000
+23987623568943567.00000000000000000005677834650000000000000
+23856934568940675.000000000000000435676782300000000000000456784
+77567648698496.00000000000000000058767475000000000045856380000000000\
+0000
+2348672354968723.237482354600000000000325698739450234689243562387000\
+0000034578
+-2354768.000000000000000000000000000000000000
+-96739874567.000000000347683456
+-3764568345.000000000004573845000000347683460
+-356784356.934568495770004586495678300000000
+74325437345273852773827101738273127312738521733017537073520735207307\
+570358738257390761276072160719802671980267018728630178.7082681027680\
+52176021786784127612768127086782782176817317820783071097801773817867\
+8012767377058785378278207385237085237803278203782037237582795870
+-7567527327852738512737285378527382578372836789657385273852729836783\
+72867327835672967385278372637862738627836279863782673862783670.71738\
+17836173871836718637861073861783678160376017836701860376017810773527\
+8372832783728367826738627836278378260736270367362073867097307925
+9812734012837410982345719208345712908357412903587192048571920458712.\
+23957182459817249058172945781
diff --git a/testsuite/bc_divide.bc b/testsuite/bc_divide.bc
new file mode 100644
index 000000000..4d0caddc9
--- /dev/null
+++ b/testsuite/bc_divide.bc
@@ -0,0 +1,31 @@
+0 / 1
+0 / 321566
+0 / 0.3984567238456
+1 / 1
+1 / 1287469297356
+1 / 0.2395672438567234
+1 / 237586239856.0293596728392360
+1249687284356 / 3027949207835207
+378617298617396719 / 35748521
+9348576237845624358 / 0.9857829375461
+35768293846193284 / 2374568947.045762839567823
+-78987234567812345 / 876542837618936
+-356789237555535468 / 0.3375273860984786903
+-5203475364850390 / 435742903748307.70869378534043296404530458
+-0.37861723347576903 / 7385770896
+-0.399454682043962 / 0.34824389304
+-0.6920414523873204 / 356489645223.76076045304879030
+-35872917389671.7573280963748 / 73924708
+-78375896314.4836709876983 / 0.78356798637817
+-2374123896417.143789621437581 / 347821469423789.1473856783960
+-896729350238549726 / -34976289345762
+-2374568293458762348596 / -0.8792370647234987679
+-237584692306721845726038 / -21783910782374529637.978102738746189024761
+-0.23457980123576298375682 / -1375486293874612
+-0.173897061862478951264 / -0.8179327486017634987516298745
+-0.9186739823576829347586 / -0.235678293458756239846
+-0.9375896183746982374568 / -13784962873546.0928729395476283745
+-2930754618923467.12323745862937465 / -734869238465
+-23745861923467.874675129834675 / -0.23542357869124756
+-3878923750692883.7238596702834756902 / -7384192674957215364986723.9738461923487621983
+1 / 0.00000000000000000000000000000000000000000002346728372937352457354204563027
diff --git a/testsuite/bc_divide_results.txt b/testsuite/bc_divide_results.txt
new file mode 100644
index 000000000..c19f2f9b0
--- /dev/null
+++ b/testsuite/bc_divide_results.txt
@@ -0,0 +1,31 @@
+0
+0
+0
+1.00000000000000000000
+.00000000000077671755
+4.17419336592637110778
+.00000000000420899796
+.00041271738677857404
+10591131829.40901859967857131767
+9483402361494453751.52388015648196297248
+15063068.13735316451497043884
+-90.11223545260531110575
+-1057067521778623447.45138528213564485251
+-11.94161814246320631346
+-.00000000005126306228
+-1.14705437777218917343
+-.00000000000194126663
+-485262.88923145638029569727
+-100024372711.74763635544535424582
+-.00682569681609989277
+25638.20711150436682153521
+2700714504347599627864.24626421085374010264
+10906.42973524078145692731
+.00000000000000017054
+.21260557443109085166
+3.89799997647407910677
+.00000000000006801538
+3988.13076601933678578945
+100864416620775.31076855630746548983
+.00000000052530099381
+42612515855353136519261264261472677699404182.78776061098893912189
diff --git a/testsuite/bc_exponent.bc b/testsuite/bc_exponent.bc
new file mode 100644
index 000000000..40bcf3c5a
--- /dev/null
+++ b/testsuite/bc_exponent.bc
@@ -0,0 +1,22 @@
+e(0)
+e(0.5)
+e(1)
+e(1.5)
+e(1.74)
+e(2)
+e(3.2345)
+e(5.283957)
+e(13.23857)
+e(100)
+e(283.238957)
+e(-0.5)
+e(-1)
+e(-1.5)
+e(-1.74)
+e(-2)
+e(-3.2345)
+e(-5.283957)
+e(-13.23857)
+e(-100)
+e(-283.238957)
+e(142.749502399)
diff --git a/testsuite/bc_exponent_results.txt b/testsuite/bc_exponent_results.txt
new file mode 100644
index 000000000..a1f1fe2b4
--- /dev/null
+++ b/testsuite/bc_exponent_results.txt
@@ -0,0 +1,25 @@
+1.00000000000000000000
+1.64872127070012814684
+2.71828182845904523536
+4.48168907033806482260
+5.69734342267199101193
+7.38905609893065022723
+25.39367176822616278859
+197.14845034328553587817
+561613.96621445383501864766
+26881171418161354484126255515800135873611118.77374192241519160861
+10212124131159922810249757193864245307850725332411569566443792548720\
+75182918653384240389953781407569563117008113027037939783.70141667971\
+570827872
+.60653065971263342360
+.36787944117144232159
+.22313016014842982893
+.17552040061699687169
+.13533528323661269189
+.03937988996342191888
+.00507231985977442865
+.00000178058250000525
+0
+0
+98928445824097165243611240348236907682258759298273030827411201.25833\
+645622510213538
diff --git a/testsuite/bc_log.bc b/testsuite/bc_log.bc
new file mode 100644
index 000000000..54115e380
--- /dev/null
+++ b/testsuite/bc_log.bc
@@ -0,0 +1,22 @@
+l(0)
+l(0.5)
+l(1)
+l(1.5)
+l(1.74)
+l(2)
+l(3.2345)
+l(5.283957)
+l(13.23857)
+l(100)
+l(283.238957)
+l(-0.5)
+l(-1)
+l(-1.5)
+l(-1.74)
+l(-2)
+l(-3.2345)
+l(-5.283957)
+l(-13.23857)
+l(-100)
+l(-283.238957)
+l(10430710.3325472917)
diff --git a/testsuite/bc_log_results.txt b/testsuite/bc_log_results.txt
new file mode 100644
index 000000000..ce840a0d9
--- /dev/null
+++ b/testsuite/bc_log_results.txt
@@ -0,0 +1,22 @@
+-99999999999999999999.00000000000000000000
+-.69314718055994530941
+0
+.40546510810816438197
+.55388511322643765995
+.69314718055994530941
+1.17387435650190306676
+1.66467524885255369652
+2.58313453863349348434
+4.60517018598809136803
+5.64629091238730017971
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+-99999999999999999999.00000000000000000000
+16.16026492940839137014
diff --git a/testsuite/bc_misc.bc b/testsuite/bc_misc.bc
new file mode 100644
index 000000000..571f4a87e
--- /dev/null
+++ b/testsuite/bc_misc.bc
@@ -0,0 +1,13 @@
+4.1*1.-13^ - 74 - 1284597623841*1.-13^ - 757
+4.1*1.\
+-1\
+3^ - 74 - 1284597623841*1.\
+-1\
+3^ - 757
+obase = 9
+4.1*1.-13^ - 74 - 1284597623841*1.-13^ - 757
+4.1*1.\
+-1\
+3^ - 74 - 1284597623841*1.\
+-1\
+3^ - 757
diff --git a/testsuite/bc_misc1.bc b/testsuite/bc_misc1.bc
new file mode 100644
index 000000000..f666d701a
--- /dev/null
+++ b/testsuite/bc_misc1.bc
@@ -0,0 +1,74 @@
+define x(x) {
+        return(x)
+}
+define y() {
+        return;
+}
+define z() {return}
+scale = 0
+x=2
+x[0]=3
+x
+x[0]
+scale
+ibase
+obase
+x ( 7 )
+x + x( 8 )
+x - x[0]
+321 * x
+2 ^ x[0]
+x++
+--x
+x += 9
+x
+length(2381)
+sqrt(9)
+scale(238.1)
+x=2
+x[0]=3
+(x)
+(x[0])
+(scale)
+(ibase)
+(obase)
+(x ( 7 ))
+(x + x( 8 ))
+(x - x[0])
+(321 * x)
+(2 ^ x[0])
+(x++)
+(--x)
+(x += 9)
+(length(2381))
+(sqrt(9))
+(scale(238.1))
+(scale = 0)
+(x = 10)
+(x += 100)
+(x -= 10)
+(x *= 10)
+(x /= 100)
+(x ^= 10)
+(x = sqrt(x))
+(x[1 - 1])
+x[(1 - 1)]
+2 + \
+3
+++ibase
+--ibase
+++obase
+--obase
+++last
+--last
+last
+last = 100
+last
+. = 150
+.
+++scale
+--scale
+y()
+z()
+2 + /*
+*/3
diff --git a/testsuite/bc_misc1_results.txt b/testsuite/bc_misc1_results.txt
new file mode 100644
index 000000000..a9c278069
--- /dev/null
+++ b/testsuite/bc_misc1_results.txt
@@ -0,0 +1,57 @@
+2
+3
+0
+10
+10
+7
+10
+-1
+642
+8
+2
+2
+11
+4
+3
+1
+2
+3
+0
+10
+10
+7
+10
+-1
+642
+8
+2
+2
+11
+4
+3
+1
+0
+10
+110
+100
+1000
+10
+10000000000
+100000
+3
+3
+5
+11
+10
+10
+10
+11
+10
+10
+100
+150
+1
+0
+0
+0
+5
diff --git a/testsuite/bc_misc2.bc b/testsuite/bc_misc2.bc
new file mode 100644
index 000000000..44fc40fa1
--- /dev/null
+++ b/testsuite/bc_misc2.bc
@@ -0,0 +1,44 @@
+define x() {
+"x"
+return ( 1 )
+}
+define y() {
+"y"
+return (2)
+}
+define z() {
+"z"
+return (3)
+}
+
+if ( x() == y() ) {1}
+1
+if ( x() <= y() ) {2}
+if ( y() >= x() ) {3}
+if ( x() != y() ) {4}
+if ( x() < y() ) {5}
+if ( y() > x() ) {6}
+
+if ( x() == z() ) {11}
+11
+if ( x() <= z() ) {12}
+if ( z() >= x() ) {13}
+if ( x() != z() ) {14}
+if ( x() < z() ) {15}
+if ( z() > x() ) {16}
+
+x = -10
+while (x <= 0) {
+        x
+        if (x == -5) break;
+        x += 1
+}
+
+define u() {
+        auto a[];
+        return a[0]
+}
+
+u()
+
+if (x == -4) x else x - 4
diff --git a/testsuite/bc_misc2_results.txt b/testsuite/bc_misc2_results.txt
new file mode 100644
index 000000000..022ca8728
--- /dev/null
+++ b/testsuite/bc_misc2_results.txt
@@ -0,0 +1,20 @@
+xy1
+xy2
+yx3
+xy4
+xy5
+yx6
+xz11
+xz12
+zx13
+xz14
+xz15
+zx16
+-10
+-9
+-8
+-7
+-6
+-5
+0
+-9
diff --git a/testsuite/bc_misc_results.txt b/testsuite/bc_misc_results.txt
new file mode 100644
index 000000000..e2db76e0e
--- /dev/null
+++ b/testsuite/bc_misc_results.txt
@@ -0,0 +1,4 @@
+-1284597623836.9
+-1284597623836.9
+-4483684050181.80
+-4483684050181.80
diff --git a/testsuite/bc_modulus.bc b/testsuite/bc_modulus.bc
new file mode 100644
index 000000000..e2656a6e9
--- /dev/null
+++ b/testsuite/bc_modulus.bc
@@ -0,0 +1,70 @@
+1 % 1
+2 % 1
+16 % 4
+15 % 4
+17 % 4
+2389473 % 5
+39240687239 % 1
+346728934 % 23958
+3496723859067234 % 298375462837546928347623059375486
+-1 % 1
+-2 % 1
+-47589634875689345 % 37869235
+-1274852934765 % 2387628935486273546
+-6324758963 % 237854962
+1 % -1
+2 % -1
+2 % -2
+2 % -3
+16 % 5
+15 % 5
+14 % 5
+89237423 % -237856923854
+123647238946 % -12467
+-1 % -1
+-2 % -1
+-2 % -2
+-2 % -3
+-13 % -7
+-14 % -7
+-15 % -7
+-12784956 % -32746
+-127849612 % -23712347682193
+1 % 0.2395672438567234
+scale = 0
+1 % 1
+2 % 1
+16 % 4
+15 % 4
+17 % 4
+2389473 % 5
+39240687239 % 1
+346728934 % 23958
+3496723859067234 % 298375462837546928347623059375486
+-1 % 1
+-2 % 1
+-47589634875689345 % 37869235
+-1274852934765 % 2387628935486273546
+-6324758963 % 237854962
+1 % -1
+2 % -1
+2 % -2
+2 % -3
+16 % 5
+15 % 5
+14 % 5
+89237423 % -237856923854
+123647238946 % -12467
+-1 % -1
+-2 % -1
+-2 % -2
+-2 % -3
+-13 % -7
+-14 % -7
+-15 % -7
+-12784956 % -32746
+-127849612 % -23712347682193
+-3191280681 % 641165986
+scale = 0; -899510228 % -2448300078.40314
+scale = 0; -7424863 % -207.2609738667
+scale = 0; 3769798918 % 0.6
diff --git a/testsuite/bc_modulus_results.txt b/testsuite/bc_modulus_results.txt
new file mode 100644
index 000000000..e85145be7
--- /dev/null
+++ b/testsuite/bc_modulus_results.txt
@@ -0,0 +1,69 @@
+0
+0
+0
+0
+0
+0
+0
+.00000000000000002026
+2747189239559.46904933397471305894
+0
+0
+-.00000000000011057855
+-.00076922992566770712
+-.00000000000050364144
+0
+0
+0
+.00000000000000000002
+0
+0
+0
+.00000000070585524350
+.00000000000000002898
+0
+0
+0
+-.00000000000000000002
+-.00000000000000000005
+0
+-.00000000000000000002
+-.00000000000000011722
+-.00000002640923745817
+.000000000000000000000404744340951948
+0
+0
+0
+3
+1
+3
+0
+8758
+3496723859067234
+0
+0
+-8236960
+-1274852934765
+-140529951
+0
+0
+0
+2
+1
+0
+4
+89237423
+6692
+0
+0
+0
+-2
+-6
+0
+-1
+-14016
+-127849612
+-626616737
+-899510228.00000
+-153.1331732059
+.4
diff --git a/testsuite/bc_multiply.bc b/testsuite/bc_multiply.bc
new file mode 100644
index 000000000..8d5aa36d5
--- /dev/null
+++ b/testsuite/bc_multiply.bc
@@ -0,0 +1,42 @@
+0 * 0
+0.000 * 0
+1 * 0
+0 * 1
+0 * 2498752389672835476
+873246913745129084576134 * 0
+1 * 472638590273489273456
+12374861230476103672835496 * 1
+1 * 1
+2 * 1
+1 * 2
+2 * 2
+3 * 14
+17 * 8
+1892467513846753 * 1872439821374591038746
+328962735862.2973546835638947635 * 1728465791348762356
+38745962374538.387427384672934867234 * 0.1932476528394672837568923754
+9878894576289457634856.2738627161689017387608947567654 * 37842939768237596237854203.29874372139852739126739621793162
+-1 * 1
+-1 * 2
+78893457 * -34876238956
+235678324957634 * -0.2349578349672389576
+-12849567821934 * 12738462937681
+1274861293467.927843682937462 * -28935678239
+2936077239872.12937462836 * -0.012842357682435762
+2387692387566.2378569237546 * -272189345628.123875629835876
+0.012348629356782835962 * -23487692356
+0.4768349567348675934 * -0.23756834576934857638495
+0.98748395367485962735486 * -4675839462354867.376834956738456
+-321784627934586 * -235762378596
+-32578623567892356 * -0.32567384579638456
+-35768232346876 * -2348672935602387620.28375682349576237856
+-0.2356728394765234 * -238759624356978
+-0.2345768212346780 * -0.235768124697074385948943532045
+-0.370873860736785306278630 * -7835678398607.7086378076867096270
+-78365713707.7089637863786730 * -738580798679306780
+-73867038956790490258249 * -0.7379862716391723672803679
+-378621971598721837710387 * -98465373878350798.09743896037963078560
+37164201 * 2931559660
+679468076118972457796560530571.46287161642138401685 * 93762.2836
+.000000000000000000000000001 * .0000000000000000000000001
+scale = 0; 237854962 * -26
diff --git a/testsuite/bc_multiply_results.txt b/testsuite/bc_multiply_results.txt
new file mode 100644
index 000000000..1dee19c37
--- /dev/null
+++ b/testsuite/bc_multiply_results.txt
@@ -0,0 +1,43 @@
+0
+0
+0
+0
+0
+0
+472638590273489273456
+12374861230476103672835496
+1
+2
+2
+4
+42
+136
+3543531533584430580556128344529291738
+568600835566479683035874339053.4411638427543228060
+7487566285885.8557453089005171423976251098
+373846412427291014394738378015501363938345620046.7869650248829232267\
+2297002026819
+-1
+-2
+-2751507058396910892
+-55374468980751.0837656919743223184
+-163683743464924630346895054
+-36888976187143312550878.567134791289418
+-37706154097.69662826215753378160
+-649904428532907022680241.94791869424754101064
+-290040807.350385412976669306472
+-.11328089187650139309272
+-4617316439035114.40320367843985107357898
+75864709277486862054521256
+10610005628108234.92015040406042336
+84007879267445533366251128067927.91168012197674537856
+56269158624557.1027018519702852
+.055305737239900889424090264801
+2906048299183.472237078104362540110129
+57879411419313585866282299201.3825582163029400
+54512860676747314187949.9414724679950990587298071
+37281153992026463004361915151761464058058.54968338992209002720
+108949072447731660
+63708478450213482928510139572007971.83536929222529239687
+0
+-6184229012
diff --git a/testsuite/bc_numbers1.bc b/testsuite/bc_numbers1.bc
new file mode 100644
index 000000000..fd4e225ee
--- /dev/null
+++ b/testsuite/bc_numbers1.bc
@@ -0,0 +1,23 @@
+ibase=G
+define f() {
+a00=00;a01=01;a02=02;a03=03;a04=04;a05=05;a06=06;a07=07;a08=08;a09=09;a0a=0A;a0b=0B;a0c=0C;a0d=0D;a0e=0E;a0f=0F
+a10=10;a11=11;a12=12;a13=13;a14=14;a15=15;a16=16;a17=17;a18=18;a19=19;a1a=1A;a1b=1B;a1c=1C;a1d=1D;a1e=1E;a1f=1F
+a20=20;a21=21;a22=22;a23=23;a24=24;a25=25;a26=26;a27=27;a28=28;a29=29;a2a=2A;a2b=2B;a2c=2C;a2d=2D;a2e=2E;a2f=2F
+a30=30;a31=31;a32=32;a33=33;a34=34;a35=35;a36=36;a37=37;a38=38;a39=39;a3a=3A;a3b=3B;a3c=3C;a3d=3D;a3e=3E;a3f=3F
+a40=40;a41=41;a42=42;a43=43;a44=44;a45=45;a46=46;a47=47;a48=48;a49=49;a4a=4A;a4b=4B;a4c=4C;a4d=4D;a4e=4E;a4f=4F
+a50=50;a51=51;a52=52;a53=53;a54=54;a55=55;a56=56;a57=57;a58=58;a59=59;a5a=5A;a5b=5B;a5c=5C;a5d=5D;a5e=5E;a5f=5F
+a60=60;a61=61;a62=62;a63=63;a64=64;a65=65;a66=66;a67=67;a68=68;a69=69;a6a=6A;a6b=6B;a6c=6C;a6d=6D;a6e=6E;a6f=6F
+a70=70;a71=71;a72=72;a73=73;a74=74;a75=75;a76=76;a77=77;a78=78;a79=79;a7a=7A;a7b=7B;a7c=7C;a7d=7D;a7e=7E;a7f=7F
+a80=80;a81=81;a82=82;a83=83;a84=84;a85=85;a86=86;a87=87;a88=88;a89=89;a8a=8A;a8b=8B;a8c=8C;a8d=8D;a8e=8E;a8f=8F
+a90=90;a91=91;a92=92;a93=93;a94=94;a95=95;a96=96;a97=97;a98=98;a99=99;a9a=9A;a9b=9B;a9c=9C;a9d=9D;a9e=9E;a9f=9F
+aa0=A0;aa1=A1;aa2=A2;aa3=A3;aa4=A4;aa5=A5;aa6=A6;aa7=A7;aa8=A8;aa9=A9;aaa=AA;aab=AB;aac=AC;aad=AD;aae=AE;aaf=AF
+ab0=B0;ab1=B1;ab2=B2;ab3=B3;ab4=B4;ab5=B5;ab6=B6;ab7=B7;ab8=B8;ab9=B9;aba=BA;abb=BB;abc=BC;abd=BD;abe=BE;abf=BF
+ac0=C0;ac1=C1;ac2=C2;ac3=C3;ac4=C4;ac5=C5;ac6=C6;ac7=C7;ac8=C8;ac9=C9;aca=CA;acb=CB;acc=CC;acd=CD;ace=CE;acf=CF
+ad0=D0;ad1=D1;ad2=D2;ad3=D3;ad4=D4;ad5=D5;ad6=D6;ad7=D7;ad8=D8;ad9=D9;ada=DA;adb=DB;adc=DC;add=DD;ade=DE;adf=DF
+ae0=E0;ae1=E1;ae2=E2;ae3=E3;ae4=E4;ae5=E5;ae6=E6;ae7=E7;ae8=E8;ae9=E9;aea=EA;aeb=EB;aec=EC;aed=ED;aee=EE;aef=EF
+af0=F0;af1=F1;af2=F2;af3=F3;af4=F4;af5=F5;af6=F6;af7=F7;af8=F8;af9=F9;afa=FA;afb=FB;afc=FC;afd=FD;afe=FE;aff=FF
+# this tests "index encoding" in bc.c: are numbers after 0xfc encoded correctly?
+af0;af1;af2;af3;af4;af5;af6;af7;af8;af9;afa;afb;afc;afd;afe;aff
+}
+f()
+halt
diff --git a/testsuite/bc_numbers1_results.txt b/testsuite/bc_numbers1_results.txt
new file mode 100644
index 000000000..e0ace1049
--- /dev/null
+++ b/testsuite/bc_numbers1_results.txt
@@ -0,0 +1,17 @@
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+0
diff --git a/testsuite/bc_numbers2.bc b/testsuite/bc_numbers2.bc
new file mode 100644
index 000000000..208fe0d4d
--- /dev/null
+++ b/testsuite/bc_numbers2.bc
@@ -0,0 +1,18 @@
+define f() {
+        "ibase:";ibase
+        a=A;a
+        a=F;a
+        a=G;a
+        a=Z;a
+        a=0A;a
+        a=0F;a
+        a=0G;a
+        a=0Z;a
+}
+f()
+ibase=9;f()
+ibase=A;f()
+ibase=F;f()
+ibase=G;f()
+#ibase=Z;f()
+halt
diff --git a/testsuite/bc_numbers2_results.txt b/testsuite/bc_numbers2_results.txt
new file mode 100644
index 000000000..e3400bd92
--- /dev/null
+++ b/testsuite/bc_numbers2_results.txt
@@ -0,0 +1,50 @@
+ibase:10
+10
+15
+16
+35
+10
+15
+16
+35
+0
+ibase:9
+10
+15
+16
+35
+10
+15
+16
+35
+0
+ibase:10
+10
+15
+16
+35
+10
+15
+16
+35
+0
+ibase:15
+10
+15
+16
+35
+10
+15
+16
+35
+0
+ibase:16
+10
+15
+16
+35
+10
+15
+16
+35
+0
diff --git a/testsuite/bc_pi.bc b/testsuite/bc_pi.bc
new file mode 100644
index 000000000..b98419f12
--- /dev/null
+++ b/testsuite/bc_pi.bc
@@ -0,0 +1,4 @@
+for (i = 0; i <= 100; ++i) {
+        scale = i
+        4 * a(1)
+}
diff --git a/testsuite/bc_pi_results.txt b/testsuite/bc_pi_results.txt
new file mode 100644
index 000000000..128d6c0ca
--- /dev/null
+++ b/testsuite/bc_pi_results.txt
@@ -0,0 +1,135 @@
+0
+2.8
+3.12
+3.140
+3.1412
+3.14156
+3.141592
+3.1415924
+3.14159264
+3.141592652
+3.1415926532
+3.14159265356
+3.141592653588
+3.1415926535896
+3.14159265358976
+3.141592653589792
+3.1415926535897932
+3.14159265358979320
+3.141592653589793236
+3.1415926535897932384
+3.14159265358979323844
+3.141592653589793238460
+3.1415926535897932384624
+3.14159265358979323846264
+3.141592653589793238462640
+3.1415926535897932384626432
+3.14159265358979323846264336
+3.141592653589793238462643380
+3.1415926535897932384626433832
+3.14159265358979323846264338324
+3.141592653589793238462643383276
+3.1415926535897932384626433832792
+3.14159265358979323846264338327948
+3.141592653589793238462643383279500
+3.1415926535897932384626433832795028
+3.14159265358979323846264338327950288
+3.141592653589793238462643383279502884
+3.1415926535897932384626433832795028840
+3.14159265358979323846264338327950288416
+3.141592653589793238462643383279502884196
+3.1415926535897932384626433832795028841968
+3.14159265358979323846264338327950288419716
+3.141592653589793238462643383279502884197168
+3.1415926535897932384626433832795028841971692
+3.14159265358979323846264338327950288419716936
+3.141592653589793238462643383279502884197169396
+3.1415926535897932384626433832795028841971693992
+3.14159265358979323846264338327950288419716939936
+3.141592653589793238462643383279502884197169399372
+3.1415926535897932384626433832795028841971693993748
+3.14159265358979323846264338327950288419716939937508
+3.141592653589793238462643383279502884197169399375104
+3.1415926535897932384626433832795028841971693993751056
+3.14159265358979323846264338327950288419716939937510580
+3.141592653589793238462643383279502884197169399375105820
+3.1415926535897932384626433832795028841971693993751058208
+3.14159265358979323846264338327950288419716939937510582096
+3.141592653589793238462643383279502884197169399375105820972
+3.1415926535897932384626433832795028841971693993751058209748
+3.14159265358979323846264338327950288419716939937510582097492
+3.141592653589793238462643383279502884197169399375105820974944
+3.1415926535897932384626433832795028841971693993751058209749444
+3.14159265358979323846264338327950288419716939937510582097494456
+3.141592653589793238462643383279502884197169399375105820974944592
+3.1415926535897932384626433832795028841971693993751058209749445920
+3.14159265358979323846264338327950288419716939937510582097494459228
+3.141592653589793238462643383279502884197169399375105820974944592304
+3.141592653589793238462643383279502884197169399375105820974944592307\
+6
+3.141592653589793238462643383279502884197169399375105820974944592307\
+80
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816404
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164060
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406284
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062860
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862088
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620896
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208996
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089984
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899860
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899862800
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628032
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280348
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899862803480
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628034824
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280348252
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899862803482532
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628034825340
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280348253420
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899862803482534208
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628034825342116
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280348253421168
+3.141592653589793238462643383279502884197169399375105820974944592307\
+81640628620899862803482534211704
+3.141592653589793238462643383279502884197169399375105820974944592307\
+816406286208998628034825342117064
+3.141592653589793238462643383279502884197169399375105820974944592307\
+8164062862089986280348253421170676
diff --git a/testsuite/bc_power.bc b/testsuite/bc_power.bc
new file mode 100644
index 000000000..5657cdd7b
--- /dev/null
+++ b/testsuite/bc_power.bc
@@ -0,0 +1,44 @@
+0 ^ 0
+0 ^ 1
+0 ^ 1894
+1 ^ 0
+39746823 ^ 0
+0.238672983047682 ^ 0
+18394762374689237468.97354862973846 ^ 0
+1 ^ 1
+2 ^ 1
+18927361346 ^ 1
+0.23523785962738592635777 ^ 1
+328956734869213746.89782398457234 ^ 1
+8937 ^ 98
+0.124876812394 ^ 2396
+93762.2836 ^ 13
+1 ^ -1
+2 ^ -1
+10 ^ -1
+683734768 ^ -1
+38579623756.897937568235 ^ -1
+1 ^ -32467
+2 ^ -53
+23897 ^ -213
+-1 ^ 1
+-1 ^ 2
+-2 ^ 1
+-2 ^ 2
+-237 ^ 294
+-3746 ^ 28
+-0.3548 ^ 35
+-4267.234 ^ 37
+-326.3246 ^ 78
+-1 ^ -1
+-1 ^ -2
+-2 ^ -1
+-2 ^ -2
+-237 ^ -293
+-784 ^ -23
+-86 ^ -7
+-0.23424398 ^ -781
+-178.234786 ^ -879
+-1274.346 ^ -768
+0 ^ -251
+-0.2959371298 ^ 227
diff --git a/testsuite/bc_power_results.txt b/testsuite/bc_power_results.txt
new file mode 100644
index 000000000..997f44f59
--- /dev/null
+++ b/testsuite/bc_power_results.txt
@@ -0,0 +1,73 @@
+1
+0
+0
+1
+1
+1
+1
+1
+2
+18927361346
+.23523785962738592635777
+328956734869213746.89782398457234
+16473742664221279051571200630760751138799221376964991600670000200609\
+08006052596520320731708604393844468006290371918262741885989163144389\
+39367835091560809036359941703341471396407660150658436796925310445979\
+21333166245765946557344383284626113908419359990042883048537750217279\
+17481980123593363177308481941550382845381799410533956718500484099889\
+610805653325917409549921909941664118421333562129
+0
+43287877285033571298394739716218787350087163435619825150259705419.98\
+016445740928054425
+1.00000000000000000000
+.50000000000000000000
+.10000000000000000000
+.00000000146255543348
+.00000000002592041867
+1.00000000000000000000
+.00000000000000011102
+0
+-1
+1
+-2
+4
+14997322375665265051328725757939209353051902095893907150382724666290\
+49749481660976421019742616298227588464420182758442163654172400528243\
+00885441207762486233574213374503090372518590691583139696652847404883\
+08573912261119588874308960204159666762789603037188471170006223907416\
+60492840269152716750700089148882139254399347568222390231015487895905\
+73727080561379177721440905866857248917982113340543176658480139248897\
+54802503253413282808814063861470711399810899724515727713334909764746\
+27910290211411231279325882505708287941671508154740003122373284699097\
+78346501539634198926772266511968381368929692275950529960923432771985\
+12597189390708050983487158873301681237787429436264801751664042999180\
+3448659818912436089
+11478830555358864333472551120140548480416206583184496764727387456058\
+792742209537931243951391229607936
+-.00000000000000017759
+-2067373624686414405470850679965010694114490999957199847684803894306\
+56243666149296582304582679590231948238805965642713928910384741502707\
+.23224479257866798694
+11606078892843496082360561256965139908586179418605021706789617179085\
+85768049299693425729565480314913006780973928345684673490252494674985\
+0186164225375953066263609289359900615361965737717208159874390.293769\
+70206344604971
+-1.00000000000000000000
+1.00000000000000000000
+-.50000000000000000000
+.25000000000000000000
+0
+0
+-.00000000000002874159
+-1945134149489344891879057554905782841936258356736314337975569799825\
+94091939572752348215929683891336730843553721422164737465108229034947\
+87333189564755763444242676978610321731298729194092653999616928308494\
+26419468484566422775668903315088810746121307679948574976162519479931\
+18935243698160094347216562490000767121041786977792546155155934655909\
+14123833869470494708767968978717730012864171105540029928688274136791\
+98175053824022144065005509214813689232148489884560100200475909009813\
+340098100705258138.98542904577525702068
+0
+0
+0
+0
diff --git a/testsuite/bc_sine.bc b/testsuite/bc_sine.bc
new file mode 100644
index 000000000..d3a547bcd
--- /dev/null
+++ b/testsuite/bc_sine.bc
@@ -0,0 +1,207 @@
+scale = 25
+p = 4 * a(1)
+scale = 20
+s(0)
+s(0.5)
+s(1)
+s(2)
+s(3)
+s(-0.5)
+s(-1)
+s(-2)
+s(-3)
+s(p / 7)
+s(-p / 7)
+s(p / 4)
+s(-p / 4)
+s(p / 3)
+s(-p / 3)
+s(p / 2)
+s(-p / 2)
+s(3 * p / 4)
+s(3 * -p / 4)
+s(p)
+s(-p)
+s(3 * p / 2)
+s(3 * -p / 2)
+s(7 * p / 4)
+s(7 * -p / 4)
+s(13 * p / 4)
+s(13 * -p / 4)
+s(2 * p)
+s(2 * -p)
+s(131231)
+s(-131231)
+s(69.1967507777)
+s(10828)
+s(-16248506.847013148)
+s(2050281000)
+s(8224939)
+s(11334231.1154662464)
+s(-4109411249.2986954846)
+s(-2395915402.13984)
+s(-2795874313)
+s(-2262647256)
+s(3323158182.1239222084)
+s(99901384)
+s(-4202726050.2780080957)
+s(2870000621.3228830588)
+s(-4230239450.981045150)
+s(-1517506941.2678857223)
+s(4004582176)
+s(-4193724543.1108508063)
+s(-3432511261)
+s(1804484812)
+s(3229084127)
+s(-3565317246.583937244)
+s(3503281621)
+s(-3469146313.1766891244)
+s(-2257308049.307721068)
+s(-3978441809)
+s(3431564304.3752537)
+s(1249644440.2464914559)
+s(2395558891.1188487974)
+s(-2607820706.4079280116)
+s(1208310007)
+s(-3758597557.863203175)
+s(1186920672)
+s(-3988103872)
+s(-4280635328.4194857577)
+s(1051748072)
+s(-1884006279)
+s(-1046568719.2698663389)
+s(2482991410)
+s(-2106101268.1154045959)
+s(3530359346.77217900)
+s(-3373362543)
+s(2601598062)
+s(2987020862)
+s(-12033356.2057140648)
+s(-3721760707)
+s(2842387705.4145759704)
+s(3515832681.1808393297)
+s(-3658522034.16149)
+s(3963658030.2860423992)
+s(2977802215.597946655)
+s(-4271392570.4091498761)
+s(2378692585)
+s(-3545193743.629374782)
+s(-1762458738)
+s(-1174277828.4264040126)
+s(-1724994857)
+s(2802750230.1783499408)
+s(-3068133550)
+s(3324811474.621822235)
+s(2873024984)
+s(-3509056632.3888206298)
+s(1772903162.647192879)
+s(2836543102)
+s(4117858580.186)
+s(2988632386.4063754522)
+s(-4256784971.1770067447)
+s(2280820447)
+s(-2865200306)
+s(-3329592486)
+s(519126268)
+s(-2452430452)
+s(-2693220186.62104082)
+s(-3796811992.14485798)
+s(3619792326)
+s(2697791049.3038381550)
+s(3751267834.2808166557)
+s(-3761719074)
+s(-3824087631)
+s(2119301150)
+s(1398148974)
+s(-3386564819.1351816969)
+s(-3171483098)
+s(3688944941.3273318162)
+s(3060521119)
+s(-3527110404)
+s(3699631193)
+s(3872838898)
+s(3880350192)
+s(-4109411249.2986954846)
+s(-2395915402.13984)
+s(-2795874313)
+s(-2262647256)
+s(3323158182.1239222084)
+s(99901384)
+s(-4202726050.2780080957)
+s(2870000621.3228830588)
+s(-4230239450.981045150)
+s(-1517506941.2678857223)
+s(4004582176)
+s(-4193724543.1108508063)
+s(-3432511261)
+s(1804484812)
+s(3229084127)
+s(-3565317246.583937244)
+s(3503281621)
+s(-3469146313.1766891244)
+s(-2257308049.307721068)
+s(-3978441809)
+s(3431564304.3752537)
+s(1249644440.2464914559)
+s(2395558891.1188487974)
+s(-2607820706.4079280116)
+s(1208310007)
+s(-3758597557.863203175)
+s(1186920672)
+s(-3988103872)
+s(-4280635328.4194857577)
+s(1051748072)
+s(-1884006279)
+s(-1046568719.2698663389)
+s(2482991410)
+s(-2106101268.1154045959)
+s(3530359346.77217900)
+s(-3373362543)
+s(2601598062)
+s(2576349783.2446436039)
+s(2987020862)
+s(-12033356.2057140648)
+s(-3721760707)
+s(2842387705.4145759704)
+s(3515832681.1808393297)
+s(-3658522034.16149)
+s(3963658030.2860423992)
+s(2977802215.597946655)
+s(-4271392570.4091498761)
+s(2378692585)
+s(-3545193743.629374782)
+s(-1762458738)
+s(-1174277828.4264040126)
+s(-1724994857)
+s(2802750230.1783499408)
+s(-3068133550)
+s(3324811474.621822235)
+s(2873024984)
+s(-3509056632.3888206298)
+s(1772903162.647192879)
+s(2836543102)
+s(4117858580.186)
+s(2988632386.4063754522)
+s(-4256784971.1770067447)
+s(2280820447)
+s(-2865200306)
+s(-3329592486)
+s(519126268)
+s(-2452430452)
+s(-2693220186.62104082)
+s(-3796811992.14485798)
+s(3619792326)
+s(2697791049.3038381550)
+s(3751267834.2808166557)
+s(-3761719074)
+s(-3824087631)
+s(2119301150)
+s(1398148974)
+s(-3386564819.1351816969)
+s(-3171483098)
+s(3688944941.3273318162)
+s(3060521119)
+s(-3527110404)
+s(3699631193)
+s(3872838898)
+s(3880350192)
diff --git a/testsuite/bc_sine_results.txt b/testsuite/bc_sine_results.txt
new file mode 100644
index 000000000..7a4a1ab0c
--- /dev/null
+++ b/testsuite/bc_sine_results.txt
@@ -0,0 +1,204 @@
+0
+.47942553860420300027
+.84147098480789650665
+.90929742682568169539
+.14112000805986722210
+-.47942553860420300027
+-.84147098480789650665
+-.90929742682568169539
+-.14112000805986722210
+.43388373911755812047
+-.43388373911755812047
+.70710678118654752439
+-.70710678118654752439
+.86602540378443864676
+-.86602540378443864676
+1.00000000000000000000
+-1.00000000000000000000
+.70710678118654752440
+-.70710678118654752440
+0
+0
+-1.00000000000000000000
+1.00000000000000000000
+-.70710678118654752440
+.70710678118654752440
+-.70710678118654752439
+.70710678118654752439
+0
+0
+.38173640790989719211
+-.38173640790989719211
+.08162149793819434415
+.87714140586973771462
+-.91157035998052051623
+-.69638975047120679880
+-.94806056135672896231
+-.54548669379730874215
+.14605234154783145589
+-.12183062787430962391
+-.89832305526331682409
+-.99513029384033555290
+.76528428398894958149
+.51077956237618482050
+-.75908868040685122962
+-.37015497140201575652
+-.51432535569032144654
+.68890201397514289831
+.88200006249578882510
+-.01188893762444044480
+-.55298206739629427055
+-.39165958853437135625
+.17732674488831117445
+-.09648816960119759281
+.15728984163381104344
+-.31554983227150461370
+-.72225704678824601977
+.96170480789326775287
+-.47636475887571231114
+-.98999375714278585763
+-.06715264746977580303
+-.69464867397161089634
+.58037673122614640119
+-.44244898040675115062
+.04242496278231069061
+.96417934585711006987
+-.54513053517818430563
+-.28604677908958958915
+-.68003854521180919710
+.26597321569379963920
+-.34591048991595943570
+-.17084074152217894535
+-.42880744669595980174
+.36518031021580667844
+-.03514839609475800827
+.93891962312087620513
+-.69421849362562852947
+.15169857474887222961
+-.00226070393499995347
+.96209233301706432156
+-.79937182245558378826
+.99966966326862290520
+.85234799672007656117
+-.20824280061137520443
+-.00761257856348159450
+.10708922858398661064
+-.80233147080821341443
+.26521358383069223461
+-.95173930946495828679
+.66210405748455769256
+.30054820568403786217
+.21640593048970779808
+-.87596287572245980692
+.74627849623707962934
+-.25747200288605259984
+-.14700538617135227740
+-.06294254604551440990
+.67948313824962059899
+.83714389089726798409
+.33805040346429707760
+.80273418514828673749
+.72262501870089953244
+-.77469383027517310713
+-.15575896025754423345
+.22191568853026376075
+.25137052589938954082
+-.80534308288073574163
+-.44963537508211028805
+-.92368907556208259630
+-.80963411623457804531
+-.96822928101198069490
+-.46604999828123759716
+.63275578793565409192
+-.40563425346575205109
+.13095444406203282638
+.96217617474547242151
+-.16256793375739137005
+.71791623784197898982
+-.10713685791219679248
+.50758780541979250307
+-.09795373670371402656
+.14605234154783145589
+-.12183062787430962391
+-.89832305526331682409
+-.99513029384033555290
+.76528428398894958149
+.51077956237618482050
+-.75908868040685122962
+-.37015497140201575652
+-.51432535569032144654
+.68890201397514289831
+.88200006249578882510
+-.01188893762444044480
+-.55298206739629427055
+-.39165958853437135625
+.17732674488831117445
+-.09648816960119759281
+.15728984163381104344
+-.31554983227150461370
+-.72225704678824601977
+.96170480789326775287
+-.47636475887571231114
+-.98999375714278585763
+-.06715264746977580303
+-.69464867397161089634
+.58037673122614640119
+-.44244898040675115062
+.04242496278231069061
+.96417934585711006987
+-.54513053517818430563
+-.28604677908958958915
+-.68003854521180919710
+.26597321569379963920
+-.34591048991595943570
+-.17084074152217894535
+-.42880744669595980174
+.36518031021580667844
+-.03514839609475800827
+.75884554410943292265
+.93891962312087620513
+-.69421849362562852947
+.15169857474887222961
+-.00226070393499995347
+.96209233301706432156
+-.79937182245558378826
+.99966966326862290520
+.85234799672007656117
+-.20824280061137520443
+-.00761257856348159450
+.10708922858398661064
+-.80233147080821341443
+.26521358383069223461
+-.95173930946495828679
+.66210405748455769256
+.30054820568403786217
+.21640593048970779808
+-.87596287572245980692
+.74627849623707962934
+-.25747200288605259984
+-.14700538617135227740
+-.06294254604551440990
+.67948313824962059899
+.83714389089726798409
+.33805040346429707760
+.80273418514828673749
+.72262501870089953244
+-.77469383027517310713
+-.15575896025754423345
+.22191568853026376075
+.25137052589938954082
+-.80534308288073574163
+-.44963537508211028805
+-.92368907556208259630
+-.80963411623457804531
+-.96822928101198069490
+-.46604999828123759716
+.63275578793565409192
+-.40563425346575205109
+.13095444406203282638
+.96217617474547242151
+-.16256793375739137005
+.71791623784197898982
+-.10713685791219679248
+.50758780541979250307
+-.09795373670371402656
diff --git a/testsuite/bc_sqrt.bc b/testsuite/bc_sqrt.bc
new file mode 100644
index 000000000..afd87ff0f
--- /dev/null
+++ b/testsuite/bc_sqrt.bc
@@ -0,0 +1,18 @@
+scale = 20
+sqrt(0)
+sqrt(2)
+sqrt(4)
+sqrt(9)
+sqrt(16)
+sqrt(25)
+sqrt(121)
+sqrt(48765)
+sqrt(9287356207356)
+sqrt(0.189274385967238956872354)
+sqrt(12389467137496823.134567829387456283946)
+sqrt(.0000000000000000000000000000123)
+sqrt(1)
+scale = 0;
+sqrt(1407)
+sqrt(79101)
+scale = 6; sqrt(88.1247699921300025847737099094480986051698668662822009535526240)
diff --git a/testsuite/bc_sqrt_results.txt b/testsuite/bc_sqrt_results.txt
new file mode 100644
index 000000000..10a4fa95d
--- /dev/null
+++ b/testsuite/bc_sqrt_results.txt
@@ -0,0 +1,16 @@
+0
+1.41421356237309504880
+2.00000000000000000000
+3.00000000000000000000
+4.00000000000000000000
+5.00000000000000000000
+11.00000000000000000000
+220.82798735667542192643
+3047516.39985021245496456781
+.435056761776252544285578
+111307983.260397019622398608908
+.0000000000000035071355833500363
+1.00000000000000000000
+37
+281
+9.3874794269883757005315658512340070115147163425837869223395574
diff --git a/testsuite/bc_strings.bc b/testsuite/bc_strings.bc
new file mode 100644
index 000000000..1cb7d6a61
--- /dev/null
+++ b/testsuite/bc_strings.bc
@@ -0,0 +1,12 @@
+"string"
+"another string"
+"yet
+another
+string"
+"noescapes\n"
+"newline
+"
+print "string"
+print "newline\n"
+
+print "\\\e\n"
diff --git a/testsuite/bc_strings_results.txt b/testsuite/bc_strings_results.txt
new file mode 100644
index 000000000..89b01ac49
--- /dev/null
+++ b/testsuite/bc_strings_results.txt
@@ -0,0 +1,5 @@
+stringanother stringyet
+another
+stringnoescapes\nnewline
+stringnewline
+\\
diff --git a/testsuite/bc_subtract.bc b/testsuite/bc_subtract.bc
new file mode 100644
index 000000000..61ea953ea
--- /dev/null
+++ b/testsuite/bc_subtract.bc
@@ -0,0 +1,32 @@
+0 - 0
+0 - 1
+1 - 0
+1 - 1
+5 - 2
+2 - 9
+321974 - 12845976238457
+2874519803456710938465 - 384723854
+10000000000000000000000000000000000000000 - 999999999999999999999999999999999999999
+10000000000000000000000000000000000000000 - 9999999999999999999999999999999999999999
+10000000000000000000000000000000000000000 - 999999999999999999999999999999999999999.99999999999999999999999999999999999
+10000000000000000000000000000000000000000 - 9999999999999999999999999999999999999999.9999999999999999999999999999999999
+10000000000000000000000000000000000000000 - 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+10000000000000000000000000000000000000001 - 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+10000000000000000000000000000000000000000.0000000001 - 0.0000000000000000000000000000000000000000000000000000000000000000000000000001
+-2 - 6
+-23784692345 - 182934721309467230894628735496027345
+-224352354962873059862 - -1245723576829456278354960278345
+-3468273598 - -12354243
+-0.92345768293 - -2354768923
+-712384634.123476823 - -24768293376
+-1879234638 - -0.917234869234
+-0.9172438692134 - -0.971284967124
+-0.1283475123465 - -0.937462346
+-124765829346.2837468293562 - -0.923467829346
+-12476829385769 - -1928476259034.8378629356
+-0.38476284395876345 - -94875394587623.2357869324857
+-4674596708467.34754789403674343567 - -48672394852354698.237548629345
+979519669 - 3018100865
+929002449 - 3280677283
+0 - -525898
+3- - -3
diff --git a/testsuite/bc_subtract_results.txt b/testsuite/bc_subtract_results.txt
new file mode 100644
index 000000000..6850b5bc1
--- /dev/null
+++ b/testsuite/bc_subtract_results.txt
@@ -0,0 +1,36 @@
+0
+-1
+1
+0
+3
+-7
+-12845975916483
+2874519803456326214611
+9000000000000000000000000000000000000001
+1
+9000000000000000000000000000000000000000.000000000000000000000000000\
+00000001
+.0000000000000000000000000000000001
+9999999999999999999999999999999999999999.999999999999999999999999999\
+99999999999999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.99999999999999999999999999\
+999999999999999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.00000000009999999999999999\
+99999999999999999999999999999999999999999999999999
+-8
+-182934721309467230894628759280719690
+1245723576605103923392087218483
+-3455919355
+2354768922.07654231707
+24055908741.876523177
+-1879234637.082765130766
+.0540410979106
+.8091148336535
+-124765829345.3602790000102
+-10548353126734.1621370644
+94875394587622.85102408852693655
+48667720255646230.89000073530825656433
+-2038581196
+-2351674834
+525898
+0
diff --git a/testsuite/bc_vars.bc b/testsuite/bc_vars.bc
new file mode 100644
index 000000000..91e3572c2
--- /dev/null
+++ b/testsuite/bc_vars.bc
@@ -0,0 +1,7 @@
+scale=10;123981239.981273987 * 12983791827398.29836472638
+scale=100;759634576394.3946587934658364895 / 9834759834895386.36459364958346
+34895734986539489834759837489573498573.398475984759837485734987598345 + 9823749832749872384234872934.28347982374987239847982374
+a=123123123.987239874; b=123123123.239479823748; a+b
+20347023.23498723984 - 28934723874.234720384
+scale=100;a=739534985.895347284957;b=238746782364.2374623784; c = a / b; c
+s7298367203972395108367910823465293084561329084561390845613409516734503870691837451 + 785621394067928346918023476190834672198467134908618723249671349062187346898241093486139046139084613490817356023871869102746182749061872609129847
diff --git a/testsuite/bc_vars_results.txt b/testsuite/bc_vars_results.txt
new file mode 100644
index 000000000..6597d8439
--- /dev/null
+++ b/testsuite/bc_vars_results.txt
@@ -0,0 +1,12 @@
+1609746610419572350599.59456175545
+.0000772397688552681359718594121969204138521230712049526233926741658\
+845368495051158801794834809672994
+34895734996363239667509709873808371507.68195580850970988421481133834\
+5
+246246247.226719697748
+-28914376850.99973314416
+.0030975704827179453786044330548590249517387192084765414205077089498\
+482709063381782183114683451531598
+78562139406792834691802347619083467219846713490861872324967134906218\
+73468982410934861390461390846134908173560238718691027461827490618726\
+09129847
diff --git a/testsuite/dc.tests b/testsuite/dc.tests
index a5da5372d..1708a4835 100755
--- a/testsuite/dc.tests
+++ b/testsuite/dc.tests
@@ -12,45 +12,91 @@ testing "dc basic syntax (stdin, multiple args)" \
         "" "10 20+p"
 
 testing "dc basic syntax (argv, single arg)" \
-        "dc '10 20+p'" \
+        "dc -e'10 20+p'" \
         "30\n" \
         "" ""
 
 testing "dc basic syntax (argv, multiple args)" \
-        "dc 10 20+p" \
+        "dc -e10 -e20+p" \
         "30\n" \
         "" ""
 
 testing "dc complex with spaces (single arg)" \
-        "dc '8 8 * 2 2 + / p'" \
+        "dc -e'8 8 * 2 2 + / p'" \
         "16\n" \
         "" ""
 
 testing "dc complex without spaces (single arg)" \
-        "dc '8 8*2 2+/p'" \
+        "dc -e'8 8*2 2+/p'" \
         "16\n" \
         "" ""
 
 testing "dc complex with spaces (multiple args)" \
-        "dc 8 8 \* 2 2 + / p" \
+        "dc -e8 -e8 -e\* -e2 -e2 -e+ -e/ -ep" \
         "16\n" \
         "" ""
 
 testing "dc complex without spaces (multiple args)" \
-        "dc 8 8\*2 2+/p" \
+        "dc -e8 -e8\*2 -e2+/p" \
         "16\n" \
         "" ""
 
-exit $FAILCOUNT
+testing "dc read" \
+        "dc -finput" \
+        "2\n9\n1\n" \
+        "1?2\nf" "9\n"
 
-# we do not support arguments
-testing "dc -e <exprs>" \
-        "dc -e '10 2+f'" \
-        "12\n" \
-        "" ""
+testing "dc read string" \
+        "dc -finput" \
+        "2\nstr\n1\n" \
+        "1?2\nf" "[str]\n"
+
+optional FEATURE_DC_BIG
+# All tests below depend on FEATURE_DC_BIG
+
+testing "dc '>a' (conditional execute string) 1" \
+        "dc" \
+        "1\n9\n" \
+        "" "[1p]sa [2p]sb 1 2>a\n9p"
+
+testing "dc '>a' (conditional execute string) 2" \
+        "dc" \
+        "9\n" \
+        "" "[1p]sa [2p]sb 2 1>a\n9p"
 
-testing "dc -f <exprs-from-given-file>" \
-        "dc -f input" \
-        "12\n" \
-        "10 2+f" ""
+testing "dc '>aeb' (conditional execute string with else)" \
+        "dc" \
+        "2\n9\n" \
+        "" "[1p]sa [2p]sb 2 1>aeb\n9p"
 
+testing "dc space can be a register" \
+        "dc" \
+        "2\n9\n" \
+        "" "[2p]s \n[3p]\nl x\n9p"
+
+testing "dc newline can be a register" \
+        "dc" \
+        "2\n9\n" \
+        "" "[2p]s\n[3p]l\nx\n9p"
+
+for f in dc_*.dc; do
+        r="`basename "$f" .dc`_results.txt"
+        test -f "$r" || continue
+        # testing "test name" "command" "expected result" "file input" "stdin"
+        testing "dc $f" \
+                "{ { dc $f 2>&1; echo E:\$? >&2; } | diff -u - $r; echo E:\$?; } 2>&1" \
+                "E:0\nE:0\n" \
+                "" ""
+done
+
+for f in dcx_*.dc; do
+        r="`basename "$f" .dc`_results.txt"
+        test -f "$r" || continue
+        # testing "test name" "command" "expected result" "file input" "stdin"
+        testing "dc -x $f" \
+                "{ { dc -x $f 2>&1; echo E:\$? >&2; } | diff -u - $r; echo E:\$?; } 2>&1" \
+                "E:0\nE:0\n" \
+                "" ""
+done
+
+exit $FAILCOUNT
diff --git a/testsuite/dc_add.dc b/testsuite/dc_add.dc
new file mode 100644
index 000000000..42da2f1f3
--- /dev/null
+++ b/testsuite/dc_add.dc
@@ -0,0 +1,33 @@
+0 0+pR
+0 0 0++pR
+0 1+pR
+0 1 1++pR
+1 1+pR
+1 0+pR
+2 5+pR
+237 483+pR
+999 999+pR
+2374623 324869356734856+pR
+2378639084586723980562 23468729367839+pR
+37298367203972395108367910823465293084561329084561390845613409516734503870691837451 785621394067928346918023476190834672198467134908618723249671349062187346898241093486139046139084613490817356023871869102746182749061872609129847+pR
+1.1 0+pR
+0 1.1+pR
+457283.731284923576 37842934672834.3874629385672354+pR
+1.0 0.1+pR
+3746289134067138046 0.138375863945672398456712389456273486293+pR
+_1 _1+pR
+_4 _15+pR
+_1346782 _1287904651762468913476+pR
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001+pR
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999995 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005+pR
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001+pR
+99999999999999999999999999999999999999999999999999999999999.999999999999999999999999999999999999999999999999999999999899999999999999999999999999999999999999999999999999999999999999 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001+pR
+99999999999999999999999999999999999989999999999999999999999.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001+pR
+_1889985797 2012747315+pR
+0 _14338.391079082+pR
+_2422297 1.3134942556+pR
+_1289374 1289374.2893417 0.238971 28937.28971+++pR
+1289374 1289374.2893417 _0.238971 28937.28971+++pR
+1289374 1289374.2893417 0.238971 _28937.28971+++pR
+1289374 1289374.2893417 _0.238971 _28937.28971+++pR
+1289374 _1289374.2893417 _0.238971 _28937.28971+++pR
diff --git a/testsuite/dc_add_results.txt b/testsuite/dc_add_results.txt
new file mode 100644
index 000000000..542a62ea3
--- /dev/null
+++ b/testsuite/dc_add_results.txt
@@ -0,0 +1,45 @@
+0
+0
+1
+2
+2
+1
+7
+720
+1998
+324869359109479
+2378639108055453348401
+78562139406792834691802347619083467219846713490861872324967138636055\
+45508706362018540498696043776980521464405852627147161556994835657433\
+00967298
+1.1
+1.1
+37842935130118.1187478621432354
+1.1
+3746289134067138046.138375863945672398456712389456273486293
+-2
+-19
+-1287904651762470260258
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000
+100000000000000000000000000000000000000000000000000000000000.0000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000009999
+99999999999999999999999999999999999999999999999999999999999.99999999\
+99999999999999999999999999999999999999999999999999000000000000000000\
+00000000000000000000000000000000000000009999
+99999999999999999999999999999999999990000000000000000000000.00000000\
+00000000000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000009999
+122761518
+-14338.391079082
+-2422295.6865057444
+28937.8180227
+2607685.3400807
+2549811.2386027
+2549810.7606607
+-28937.8180227
diff --git a/testsuite/dc_boolean.dc b/testsuite/dc_boolean.dc
new file mode 100644
index 000000000..ea72623b8
--- /dev/null
+++ b/testsuite/dc_boolean.dc
@@ -0,0 +1,27 @@
+0 1(pR
+1 1(pR
+2 1(pR
+_1 1(pR
+_1 0(pR
+_1 _1(pR
+_1 _2(pR
+0 1{pR
+1 1{pR
+2 1{pR
+_1 1{pR
+_1 0{pR
+_1 _1{pR
+_1 _2{pR
+0 0GpR
+0 1GpR
+1 0GpR
+_1 _1GpR
+0 _1GpR
+_1 0GpR
+1 1GpR
+238 2GpR
+0NpR
+1NpR
+_1NpR
+2398NpR
+_2983.2389NpR
diff --git a/testsuite/dc_boolean_results.txt b/testsuite/dc_boolean_results.txt
new file mode 100644
index 000000000..6d29c5b60
--- /dev/null
+++ b/testsuite/dc_boolean_results.txt
@@ -0,0 +1,27 @@
+0
+0
+1
+0
+0
+0
+1
+0
+1
+1
+0
+0
+1
+1
+1
+0
+0
+1
+0
+0
+1
+0
+1
+0
+0
+0
+0
diff --git a/testsuite/dc_decimal.dc b/testsuite/dc_decimal.dc
new file mode 100644
index 000000000..ebbb2dc91
--- /dev/null
+++ b/testsuite/dc_decimal.dc
@@ -0,0 +1,36 @@
+0pR
+0.0pR
+.0000pR
+000000000000000000000000.00000000000000000000000pR
+000000000000000000000000000135482346782356pR
+000000000000000000000000002pR
+1pR
+11pR
+123pR
+7505pR
+1023468723275435238491972521917846pR
+4343472432431705867392073517038270398027352709027389273920739037937960379637893607893607893670530278200795207952702873892786172916728961783907893607418973587857386079679267926737520730925372983782793652793pR
+_1pR
+_203pR
+_57pR
+_18586pR
+_31378682943772818461924738352952347258pR
+_823945628745673589495067238723986520375698237620834674509627345273096287563846592384526349872634895763257893467523987578690283762897568459072348758071071087813501875908127359018715023841710239872301387278pR
+.123521346523546pR
+0.1245923756273856pR
+_.1024678456387pR
+_0.8735863475634587pR
+4.0pR
+_6.0pR
+234237468293576.000000000000000000000000000000pR
+23987623568943567.00000000000000000005677834650000000000000pR
+23856934568940675.000000000000000435676782300000000000000456784pR
+77567648698496.000000000000000000587674750000000000458563800000000000000pR
+2348672354968723.2374823546000000000003256987394502346892435623870000000034578pR
+_2354768.000000000000000000000000000000000000pR
+_96739874567.000000000347683456pR
+_3764568345.000000000004573845000000347683460pR
+_356784356.934568495770004586495678300000000pR
+74325437345273852773827101738273127312738521733017537073520735207307570358738257390761276072160719802671980267018728630178.7082681027680521760217867841276127681270867827821768173178207830710978017738178678012767377058785378278207385237085237803278203782037237582795870pR
+_756752732785273851273728537852738257837283678965738527385272983678372867327835672967385278372637862738627836279863782673862783670.71738178361738718367186378610738617836781603760178367018603760178107735278372832783728367826738627836278378260736270367362073867097307925pR
+9812734012837410982345719208345712908357412903587192048571920458712.23957182459817249058172945781pR
diff --git a/testsuite/dc_decimal_results.txt b/testsuite/dc_decimal_results.txt
new file mode 100644
index 000000000..275d431c6
--- /dev/null
+++ b/testsuite/dc_decimal_results.txt
@@ -0,0 +1,51 @@
+0
+0
+0
+0
+135482346782356
+2
+1
+11
+123
+7505
+1023468723275435238491972521917846
+43434724324317058673920735170382703980273527090273892739207390379379\
+60379637893607893607893670530278200795207952702873892786172916728961\
+78390789360741897358785738607967926792673752073092537298378279365279\
+3
+-1
+-203
+-57
+-18586
+-31378682943772818461924738352952347258
+-8239456287456735894950672387239865203756982376208346745096273452730\
+96287563846592384526349872634895763257893467523987578690283762897568\
+45907234875807107108781350187590812735901871502384171023987230138727\
+8
+.123521346523546
+.1245923756273856
+-.1024678456387
+-.8735863475634587
+4.0
+-6.0
+234237468293576.000000000000000000000000000000
+23987623568943567.00000000000000000005677834650000000000000
+23856934568940675.000000000000000435676782300000000000000456784
+77567648698496.00000000000000000058767475000000000045856380000000000\
+0000
+2348672354968723.237482354600000000000325698739450234689243562387000\
+0000034578
+-2354768.000000000000000000000000000000000000
+-96739874567.000000000347683456
+-3764568345.000000000004573845000000347683460
+-356784356.934568495770004586495678300000000
+74325437345273852773827101738273127312738521733017537073520735207307\
+570358738257390761276072160719802671980267018728630178.7082681027680\
+52176021786784127612768127086782782176817317820783071097801773817867\
+8012767377058785378278207385237085237803278203782037237582795870
+-7567527327852738512737285378527382578372836789657385273852729836783\
+72867327835672967385278372637862738627836279863782673862783670.71738\
+17836173871836718637861073861783678160376017836701860376017810773527\
+8372832783728367826738627836278378260736270367362073867097307925
+9812734012837410982345719208345712908357412903587192048571920458712.\
+23957182459817249058172945781
diff --git a/testsuite/dc_divide.dc b/testsuite/dc_divide.dc
new file mode 100644
index 000000000..38b874e9f
--- /dev/null
+++ b/testsuite/dc_divide.dc
@@ -0,0 +1,33 @@
+20k
+0 1/pR
+0 321566/pR
+0 0.3984567238456/pR
+1 1/pR
+1 1287469297356/pR
+1 0.2395672438567234/pR
+1 237586239856.0293596728392360/pR
+1249687284356 3027949207835207/pR
+378617298617396719 35748521/pR
+9348576237845624358 0.9857829375461/pR
+35768293846193284 2374568947.045762839567823/pR
+_78987234567812345 876542837618936/pR
+_356789237555535468 0.3375273860984786903/pR
+_5203475364850390 435742903748307.70869378534043296404530458/pR
+_0.37861723347576903 7385770896/pR
+_0.399454682043962 0.34824389304/pR
+_0.6920414523873204 356489645223.76076045304879030/pR
+_35872917389671.7573280963748 73924708/pR
+_78375896314.4836709876983 0.78356798637817/pR
+_2374123896417.143789621437581 347821469423789.1473856783960/pR
+_896729350238549726 _34976289345762/pR
+_2374568293458762348596 _0.8792370647234987679/pR
+_237584692306721845726038 _21783910782374529637.978102738746189024761/pR
+_0.23457980123576298375682 _1375486293874612/pR
+_0.173897061862478951264 _0.8179327486017634987516298745/pR
+_0.9186739823576829347586 _0.235678293458756239846/pR
+_0.9375896183746982374568 _13784962873546.0928729395476283745/pR
+_2930754618923467.12323745862937465 _734869238465/pR
+_23745861923467.874675129834675 _0.23542357869124756/pR
+_3878923750692883.7238596702834756902 _7384192674957215364986723.9738461923487621983/pR
+1 0.00000000000000000000000000000000000000000002346728372937352457354204563027/pR
+239854711289345712 2891374 182 .2893 ///pR
diff --git a/testsuite/dc_divide_results.txt b/testsuite/dc_divide_results.txt
new file mode 100644
index 000000000..340ae94c1
--- /dev/null
+++ b/testsuite/dc_divide_results.txt
@@ -0,0 +1,32 @@
+0
+0
+0
+1.00000000000000000000
+.00000000000077671755
+4.17419336592637110778
+.00000000000420899796
+.00041271738677857404
+10591131829.40901859967857131767
+9483402361494453751.52388015648196297248
+15063068.13735316451497043884
+-90.11223545260531110575
+-1057067521778623447.45138528213564485251
+-11.94161814246320631346
+-.00000000005126306228
+-1.14705437777218917343
+-.00000000000194126663
+-485262.88923145638029569727
+-100024372711.74763635544535424582
+-.00682569681609989277
+25638.20711150436682153521
+2700714504347599627864.24626421085374010264
+10906.42973524078145692731
+.00000000000000017054
+.21260557443109085166
+3.89799997647407910677
+.00000000000006801538
+3988.13076601933678578945
+100864416620775.31076855630746548983
+.00000000052530099381
+42612515855353136519261264261472677699404182.78776061098893912189
+52187553294928.31582417732156163799
diff --git a/testsuite/dc_divmod.dc b/testsuite/dc_divmod.dc
new file mode 100644
index 000000000..1633203ff
--- /dev/null
+++ b/testsuite/dc_divmod.dc
@@ -0,0 +1,64 @@
+20k
+0 1~pRpR
+0 321566~pRpR
+0 0.3984567238456~pRpR
+1 1~pRpR
+1 1287469297356~pRpR
+1 0.2395672438567234~pRpR
+1 237586239856.0293596728392360~pRpR
+1249687284356 3027949207835207~pRpR
+378617298617396719 35748521~pRpR
+9348576237845624358 0.9857829375461~pRpR
+35768293846193284 2374568947.045762839567823~pRpR
+_78987234567812345 876542837618936~pRpR
+_356789237555535468 0.3375273860984786903~pRpR
+_5203475364850390 435742903748307.70869378534043296404530458~pRpR
+_0.37861723347576903 7385770896~pRpR
+_0.399454682043962 0.34824389304~pRpR
+_0.6920414523873204 356489645223.76076045304879030~pRpR
+_35872917389671.7573280963748 73924708~pRpR
+_78375896314.4836709876983 0.78356798637817~pRpR
+_2374123896417.143789621437581 347821469423789.1473856783960~pRpR
+_896729350238549726 _34976289345762~pRpR
+_2374568293458762348596 _0.8792370647234987679~pRpR
+_237584692306721845726038 _21783910782374529637.978102738746189024761~pRpR
+_0.23457980123576298375682 _1375486293874612~pRpR
+_0.173897061862478951264 _0.8179327486017634987516298745~pRpR
+_0.9186739823576829347586 _0.235678293458756239846~pRpR
+_0.9375896183746982374568 _13784962873546.0928729395476283745~pRpR
+_2930754618923467.12323745862937465 _734869238465~pRpR
+_23745861923467.874675129834675 _0.23542357869124756~pRpR
+_3878923750692883.7238596702834756902 _7384192674957215364986723.9738461923487621983~pRpR
+1 0.00000000000000000000000000000000000000000002346728372937352457354204563027~pRpR
+0k
+0 1~pRpR
+0 321566~pRpR
+0 0.3984567238456~pRpR
+1 1~pRpR
+1 1287469297356~pRpR
+1 0.2395672438567234~pRpR
+1 237586239856.0293596728392360~pRpR
+1249687284356 3027949207835207~pRpR
+378617298617396719 35748521~pRpR
+9348576237845624358 0.9857829375461~pRpR
+35768293846193284 2374568947.045762839567823~pRpR
+_78987234567812345 876542837618936~pRpR
+_356789237555535468 0.3375273860984786903~pRpR
+_5203475364850390 435742903748307.70869378534043296404530458~pRpR
+_0.37861723347576903 7385770896~pRpR
+_0.399454682043962 0.34824389304~pRpR
+_0.6920414523873204 356489645223.76076045304879030~pRpR
+_35872917389671.7573280963748 73924708~pRpR
+_78375896314.4836709876983 0.78356798637817~pRpR
+_2374123896417.143789621437581 347821469423789.1473856783960~pRpR
+_896729350238549726 _34976289345762~pRpR
+_2374568293458762348596 _0.8792370647234987679~pRpR
+_237584692306721845726038 _21783910782374529637.978102738746189024761~pRpR
+_0.23457980123576298375682 _1375486293874612~pRpR
+_0.173897061862478951264 _0.8179327486017634987516298745~pRpR
+_0.9186739823576829347586 _0.235678293458756239846~pRpR
+_0.9375896183746982374568 _13784962873546.0928729395476283745~pRpR
+_2930754618923467.12323745862937465 _734869238465~pRpR
+_23745861923467.874675129834675 _0.23542357869124756~pRpR
+_3878923750692883.7238596702834756902 _7384192674957215364986723.9738461923487621983~pRpR
+1 0.00000000000000000000000000000000000000000002346728372937352457354204563027~pRpR
diff --git a/testsuite/dc_divmod_results.txt b/testsuite/dc_divmod_results.txt
new file mode 100644
index 000000000..c55e9303d
--- /dev/null
+++ b/testsuite/dc_divmod_results.txt
@@ -0,0 +1,126 @@
+0
+0
+0
+0
+0
+0
+0
+1.00000000000000000000
+.00000000165742620220
+.00000000000077671755
+.000000000000000000000404744340951948
+4.17419336592637110778
+.000000001121901731436913388268041440
+.00000000000420899796
+.00000053204123177372
+.00041271738677857404
+.00000000000027633393
+10591131829.40901859967857131767
+.000000000000000000008615446968672
+9483402361494453751.52388015648196297248
+.00000000001477790730322167374655468
+15063068.13735316451497043884
+-.00000456715270151800
+-90.11223545260531110575
+-.000000000000000000002529869118878532347
+-1057067521778623447.45138528213564485251
+-.0000022326265743225222025732006233770753463532
+-11.94161814246320631346
+-.00000000004830962712
+-.00000000005126306228
+-.0000000000000000000013970700728
+-1.14705437777218917343
+-.0000000001738947526290727016287423110
+-.00000000000194126663
+-.00000000000045885284
+-485262.88923145638029569727
+-.0000000000000000000075040663382506
+-100024372711.74763635544535424582
+-.000001609445227594519190694403080
+-.00682569681609989277
+-.00000019041665271998
+25638.20711150436682153521
+-.000000000000000000005200979673140462744
+2700714504347599627864.24626421085374010264
+-.15832010238185026960887316509782343287709
+10906.42973524078145692731
+-.00000436867838665327682
+.00000000000000017054
+-.000000000000000000004322546241638067588696083330
+.21260557443109085166
+-.00000000000000000000103666428264443764258
+3.89799997647407910677
+-.000000130244568783188524951028009600190
+.00000000000006801538
+-.00000000467404345575
+3988.13076601933678578945
+-.0000000000000000000004406586308076852
+100864416620775.31076855630746548983
+-53336.193401942302558132911110799109649707477
+.00000000052530099381
+.0000000000000000000000000000000000000000000000000000000000000001907\
+266929376630027064745963897
+42612515855353136519261264261472677699404182.78776061098893912189
+0
+0
+0
+0
+0
+0
+0
+1
+1
+0
+.0417310245731064
+4
+1.0000000000000000
+0
+1249687284356
+0
+14621810
+10591131829
+.5164321195789
+9483402361494453751
+326154559.235716791539036
+15063068
+-98379182108105
+-90
+-.1523548944025685359
+-1057067521778623447
+-410303423619005.20436836125523739550164962
+-11
+-.37861723347576903
+0
+-.051210789003962
+-1
+-.69204145238732040
+0
+-65736175.7573280963748
+-485262
+-.58582391357943
+-100024372711
+-2374123896417.143789621437581
+0
+-7243991903570
+25638
+-.2165246218974912344
+2700714504347599627864
+-9361314145225494248.811531234062495956534
+10906
+-.23457980123576298375682
+0
+-.1738970618624789512640000000
+0
+-.2116391019814142152206
+3
+-.9375896183746982374568
+0
+-96095925047.12323745862937465
+3988
+-.07316224567061600
+100864416620775
+-3878923750692883.7238596702834756902
+0
+.0000000000000000000000000000000000000000000184866017689020776005643\
+3621086
+42612515855353136519261264261472677699404182
diff --git a/testsuite/dc_misc.dc b/testsuite/dc_misc.dc
new file mode 100644
index 000000000..222a3ad26
--- /dev/null
+++ b/testsuite/dc_misc.dc
@@ -0,0 +1 @@
+zp198202389.289374pzp[Hello, World!]pzpzpfrfczpfR
diff --git a/testsuite/dc_misc_results.txt b/testsuite/dc_misc_results.txt
new file mode 100644
index 000000000..fb321a817
--- /dev/null
+++ b/testsuite/dc_misc_results.txt
@@ -0,0 +1,20 @@
+0
+198202389.289374
+2
+Hello, World!
+4
+5
+5
+4
+Hello, World!
+2
+198202389.289374
+0
+4
+5
+Hello, World!
+2
+198202389.289374
+0
+0
+0
diff --git a/testsuite/dc_modexp.dc b/testsuite/dc_modexp.dc
new file mode 100644
index 000000000..a6afb9985
--- /dev/null
+++ b/testsuite/dc_modexp.dc
@@ -0,0 +1,103 @@
+0 0 1|pR
+1 0 1|pR
+1 0 2|pR
+0 10 1|pR
+1 293 1|pR
+1 2789365 2|pR
+100 8 7|pR
+10922384 15031007 201|pR
+3346529 189 254|pR
+4113416930 197 14|pR
+7709 5887 111|pR
+5487406 3252 128|pR
+2080527 2279453822 219|pR
+48895 50678 232|pR
+1535808383 2902995144 18|pR
+8437837 2882198 69|pR
+35363 25806 2|pR
+3221177403 1560419989 189|pR
+227 42775 163|pR
+2811398069 37500 173|pR
+15046850 3859895697 195|pR
+15770756 3621999893 119|pR
+6937927 3719297189 183|pR
+12573 43819 209|pR
+42098463 7584603 136|pR
+8656683 1328292415 226|pR
+209 81 157|pR
+141 13317429 26|pR
+809485795 60745 101|pR
+4882 1388217898 38|pR
+750704 78 119|pR
+668879580 2888860497 179|pR
+1152725844 15295742 154|pR
+16160694 8981529 154|pR
+216 102 3|pR
+3691227289 5344109 232|pR
+2195559299 61 222|pR
+2478990626 13007440 30|pR
+45083 44 117|pR
+224 55824 53|pR
+1372700133 89 94|pR
+205 10422 48|pR
+11887 12 73|pR
+5955 24353 114|pR
+1201697310 789722419 6|pR
+56577 231 229|pR
+96 38841 189|pR
+6529661 5636520 209|pR
+11005 15955685 27|pR
+9709 231 132|pR
+59790 1034579699 166|pR
+47892 14536879 79|pR
+48 208 21|pR
+33036 3877 65|pR
+164 6527085 249|pR
+12146850 224 37|pR
+218 16425679 62|pR
+51 27641 95|pR
+3076735605 49154 32|pR
+515652717 4117874315 143|pR
+300672671 720768884 110|pR
+9422066 206 5|pR
+43 97 13|pR
+545174510 65319 126|pR
+3317462730 704990271 51|pR
+47316 23231 202|pR
+7236571 4379567 106|pR
+2584584521 2459274189 29|pR
+61562 5035178 178|pR
+65302 112 151|pR
+63040 2168854052 213|pR
+9039611 2370306559 62|pR
+16414384 1020652061 83|pR
+7491 3853569905 172|pR
+1180322494 46670 84|pR
+3823343557 3865107254 127|pR
+6240872 55335 39|pR
+2281401897 1098411 251|pR
+61 2949190429 231|pR
+8981024 162 43|pR
+1 3568883218 212|pR
+4217100969 3471787779 8|pR
+3232237 13 243|pR
+29280 3972452706 100|pR
+13077 6431923 216|pR
+104 3098510775 140|pR
+9503298 174 242|pR
+3424695712 12184 23|pR
+184 15066347 151|pR
+2935856 14003205 184|pR
+1386637762 2128151420 71|pR
+154 11960656 12|pR
+743976432 4004778779 136|pR
+3909160595 3575680922 21|pR
+26133 3580 147|pR
+409154 170 68|pR
+149 55629 40|pR
+5753 13776176 32|pR
+3831447473 658273178 98|pR
+1527252003 2300622 207|pR
+3363824553 8244645 215|pR
+20 145 101|pR
+4005077294 2196555621 94|pR
diff --git a/testsuite/dc_modexp_results.txt b/testsuite/dc_modexp_results.txt
new file mode 100644
index 000000000..5bf0f146e
--- /dev/null
+++ b/testsuite/dc_modexp_results.txt
@@ -0,0 +1,103 @@
+1
+1
+1
+0
+0
+1
+4
+74
+1
+0
+98
+0
+72
+1
+1
+1
+1
+108
+36
+52
+65
+8
+181
+22
+7
+123
+93
+21
+17
+20
+1
+108
+58
+22
+0
+105
+161
+16
+40
+15
+45
+25
+64
+69
+0
+225
+27
+1
+22
+73
+92
+38
+15
+16
+173
+33
+32
+21
+25
+109
+71
+1
+4
+62
+15
+90
+29
+5
+40
+84
+40
+53
+8
+31
+64
+44
+14
+13
+145
+1
+1
+1
+76
+0
+189
+104
+192
+9
+119
+56
+45
+4
+32
+16
+135
+4
+29
+1
+49
+0
+128
+6
+18
diff --git a/testsuite/dc_modulus.dc b/testsuite/dc_modulus.dc
new file mode 100644
index 000000000..613944b20
--- /dev/null
+++ b/testsuite/dc_modulus.dc
@@ -0,0 +1,70 @@
+20k
+1 1%pR
+2 1%pR
+16 4%pR
+15 4%pR
+17 4%pR
+2389473 5%pR
+39240687239 1%pR
+346728934 23958%pR
+3496723859067234 298375462837546928347623059375486%pR
+_1 1%pR
+_2 1%pR
+_47589634875689345 37869235%pR
+_1274852934765 2387628935486273546%pR
+_6324758963 237854962%pR
+1 _1%pR
+2 _1%pR
+2 _2%pR
+2 _3%pR
+16 5%pR
+15 5%pR
+14 5%pR
+89237423 _237856923854%pR
+123647238946 _12467%pR
+_1 _1%pR
+_2 _1%pR
+_2 _2%pR
+_2 _3%pR
+_13 _7%pR
+_14 _7%pR
+_15 _7%pR
+_12784956 _32746%pR
+_127849612 _23712347682193%pR
+0k
+1 1%pR
+2 1%pR
+16 4%pR
+15 4%pR
+17 4%pR
+2389473 5%pR
+39240687239 1%pR
+346728934 23958%pR
+3496723859067234 298375462837546928347623059375486%pR
+_1 1%pR
+_2 1%pR
+_47589634875689345 37869235%pR
+_1274852934765 2387628935486273546%pR
+_6324758963 237854962%pR
+1 _1%pR
+2 _1%pR
+2 _2%pR
+2 _3%pR
+16 5%pR
+15 5%pR
+14 5%pR
+89237423 _237856923854%pR
+123647238946 _12467%pR
+_1 _1%pR
+_2 _1%pR
+_2 _2%pR
+_2 _3%pR
+_13 _7%pR
+_14 _7%pR
+_15 _7%pR
+_12784956 _32746%pR
+_127849612 _23712347682193%pR
+_3191280681 641165986%pR
+0k _899510228 _2448300078.40314%pR
+0k _7424863 _207.2609738667%pR
+0k 3769798918 0.6%pR
diff --git a/testsuite/dc_modulus_results.txt b/testsuite/dc_modulus_results.txt
new file mode 100644
index 000000000..7d718d22a
--- /dev/null
+++ b/testsuite/dc_modulus_results.txt
@@ -0,0 +1,68 @@
+0
+0
+0
+0
+0
+0
+0
+.00000000000000002026
+2747189239559.46904933397471305894
+0
+0
+-.00000000000011057855
+-.00076922992566770712
+-.00000000000050364144
+0
+0
+0
+.00000000000000000002
+0
+0
+0
+.00000000070585524350
+.00000000000000002898
+0
+0
+0
+-.00000000000000000002
+-.00000000000000000005
+0
+-.00000000000000000002
+-.00000000000000011722
+-.00000002640923745817
+0
+0
+0
+3
+1
+3
+0
+8758
+3496723859067234
+0
+0
+-8236960
+-1274852934765
+-140529951
+0
+0
+0
+2
+1
+0
+4
+89237423
+6692
+0
+0
+0
+-2
+-6
+0
+-1
+-14016
+-127849612
+-626616737
+-899510228.00000
+-153.1331732059
+.4
diff --git a/testsuite/dc_multiply.dc b/testsuite/dc_multiply.dc
new file mode 100644
index 000000000..1f9041d06
--- /dev/null
+++ b/testsuite/dc_multiply.dc
@@ -0,0 +1,42 @@
+0 0*pR
+0.000 0*pR
+1 0*pR
+0 1*pR
+0 2498752389672835476*pR
+873246913745129084576134 0*pR
+1 472638590273489273456*pR
+12374861230476103672835496 1*pR
+1 1*pR
+2 1*pR
+1 2*pR
+2 2*pR
+3 14*pR
+17 8*pR
+1892467513846753 1872439821374591038746*pR
+328962735862.2973546835638947635 1728465791348762356*pR
+38745962374538.387427384672934867234 0.1932476528394672837568923754*pR
+9878894576289457634856.2738627161689017387608947567654 37842939768237596237854203.29874372139852739126739621793162*pR
+_1 1*pR
+_1 2*pR
+78893457 _34876238956*pR
+235678324957634 _0.2349578349672389576*pR
+_12849567821934 12738462937681*pR
+1274861293467.927843682937462 _28935678239*pR
+2936077239872.12937462836 _0.012842357682435762*pR
+2387692387566.2378569237546 _272189345628.123875629835876*pR
+0.012348629356782835962 _23487692356*pR
+0.4768349567348675934 _0.23756834576934857638495*pR
+0.98748395367485962735486 _4675839462354867.376834956738456*pR
+_321784627934586 _235762378596*pR
+_32578623567892356 _0.32567384579638456*pR
+_35768232346876 _2348672935602387620.28375682349576237856*pR
+_0.2356728394765234 _238759624356978*pR
+_0.2345768212346780 _0.235768124697074385948943532045*pR
+_0.370873860736785306278630 _7835678398607.7086378076867096270*pR
+_78365713707.7089637863786730 _738580798679306780*pR
+_73867038956790490258249 _0.7379862716391723672803679*pR
+_378621971598721837710387 _98465373878350798.09743896037963078560*pR
+37164201 2931559660*pR
+679468076118972457796560530571.46287161642138401685 93762.2836*pR
+.000000000000000000000000001 .0000000000000000000000001*pR
+239 289 _98 .8937 _.1893 28937*****pR
diff --git a/testsuite/dc_multiply_results.txt b/testsuite/dc_multiply_results.txt
new file mode 100644
index 000000000..9666059a5
--- /dev/null
+++ b/testsuite/dc_multiply_results.txt
@@ -0,0 +1,43 @@
+0
+0
+0
+0
+0
+0
+472638590273489273456
+12374861230476103672835496
+1
+2
+2
+4
+42
+136
+3543531533584430580556128344529291738
+568600835566479683035874339053.4411638427543228060
+7487566285885.8557453089005171423976251098
+373846412427291014394738378015501363938345620046.7869650248829232267\
+2297002026819
+-1
+-2
+-2751507058396910892
+-55374468980751.0837656919743223184
+-163683743464924630346895054
+-36888976187143312550878.567134791289418
+-37706154097.696628262157533781
+-649904428532907022680241.947918694247541
+-290040807.350385412976669306472
+-.11328089187650139309272
+-4617316439035114.40320367843985107357898
+75864709277486862054521256
+10610005628108234.92015040406042336
+84007879267445533366251128067927.91168012197674537856
+56269158624557.1027018519702852
+.055305737239900889424090264801
+2906048299183.472237078104362540110129
+57879411419313585866282299201.3825582163029400
+54512860676747314187949.9414724679950990587298071
+37281153992026463004361915151761464058058.54968338992209002720
+108949072447731660
+63708478450213482928510139572007971.83536929222529239687
+0
+33137343861.8586
diff --git a/testsuite/dc_power.dc b/testsuite/dc_power.dc
new file mode 100644
index 000000000..b58ae0cbc
--- /dev/null
+++ b/testsuite/dc_power.dc
@@ -0,0 +1,45 @@
+20k
+0 0^pR
+0 1^pR
+0 1894^pR
+1 0^pR
+39746823 0^pR
+0.238672983047682 0^pR
+18394762374689237468.97354862973846 0^pR
+1 1^pR
+2 1^pR
+18927361346 1^pR
+0.23523785962738592635777 1^pR
+328956734869213746.89782398457234 1^pR
+8937 98^pR
+0.124876812394 2396^pR
+93762.2836 13^pR
+1 _1^pR
+2 _1^pR
+10 _1^pR
+683734768 _1^pR
+38579623756.897937568235 _1^pR
+1 _32467^pR
+2 _53^pR
+23897 _213^pR
+_1 1^pR
+_1 2^pR
+_2 1^pR
+_2 2^pR
+_237 294^pR
+_3746 28^pR
+_0.3548 35^pR
+_4267.234 37^pR
+_326.3246 78^pR
+_1 _1^pR
+_1 _2^pR
+_2 _1^pR
+_2 _2^pR
+_237 _293^pR
+_784 _23^pR
+_86 _7^pR
+_0.23424398 _781^pR
+_178.234786 _879^pR
+_1274.346 _768^pR
+0 _251^pR
+_0.2959371298 227^pR
diff --git a/testsuite/dc_power_results.txt b/testsuite/dc_power_results.txt
new file mode 100644
index 000000000..997f44f59
--- /dev/null
+++ b/testsuite/dc_power_results.txt
@@ -0,0 +1,73 @@
+1
+0
+0
+1
+1
+1
+1
+1
+2
+18927361346
+.23523785962738592635777
+328956734869213746.89782398457234
+16473742664221279051571200630760751138799221376964991600670000200609\
+08006052596520320731708604393844468006290371918262741885989163144389\
+39367835091560809036359941703341471396407660150658436796925310445979\
+21333166245765946557344383284626113908419359990042883048537750217279\
+17481980123593363177308481941550382845381799410533956718500484099889\
+610805653325917409549921909941664118421333562129
+0
+43287877285033571298394739716218787350087163435619825150259705419.98\
+016445740928054425
+1.00000000000000000000
+.50000000000000000000
+.10000000000000000000
+.00000000146255543348
+.00000000002592041867
+1.00000000000000000000
+.00000000000000011102
+0
+-1
+1
+-2
+4
+14997322375665265051328725757939209353051902095893907150382724666290\
+49749481660976421019742616298227588464420182758442163654172400528243\
+00885441207762486233574213374503090372518590691583139696652847404883\
+08573912261119588874308960204159666762789603037188471170006223907416\
+60492840269152716750700089148882139254399347568222390231015487895905\
+73727080561379177721440905866857248917982113340543176658480139248897\
+54802503253413282808814063861470711399810899724515727713334909764746\
+27910290211411231279325882505708287941671508154740003122373284699097\
+78346501539634198926772266511968381368929692275950529960923432771985\
+12597189390708050983487158873301681237787429436264801751664042999180\
+3448659818912436089
+11478830555358864333472551120140548480416206583184496764727387456058\
+792742209537931243951391229607936
+-.00000000000000017759
+-2067373624686414405470850679965010694114490999957199847684803894306\
+56243666149296582304582679590231948238805965642713928910384741502707\
+.23224479257866798694
+11606078892843496082360561256965139908586179418605021706789617179085\
+85768049299693425729565480314913006780973928345684673490252494674985\
+0186164225375953066263609289359900615361965737717208159874390.293769\
+70206344604971
+-1.00000000000000000000
+1.00000000000000000000
+-.50000000000000000000
+.25000000000000000000
+0
+0
+-.00000000000002874159
+-1945134149489344891879057554905782841936258356736314337975569799825\
+94091939572752348215929683891336730843553721422164737465108229034947\
+87333189564755763444242676978610321731298729194092653999616928308494\
+26419468484566422775668903315088810746121307679948574976162519479931\
+18935243698160094347216562490000767121041786977792546155155934655909\
+14123833869470494708767968978717730012864171105540029928688274136791\
+98175053824022144065005509214813689232148489884560100200475909009813\
+340098100705258138.98542904577525702068
+0
+0
+0
+0
diff --git a/testsuite/dc_sqrt.dc b/testsuite/dc_sqrt.dc
new file mode 100644
index 000000000..7c13fdd0b
--- /dev/null
+++ b/testsuite/dc_sqrt.dc
@@ -0,0 +1,14 @@
+20k
+0vpR
+2vpR
+4vpR
+9vpR
+16vpR
+25vpR
+121vpR
+48765vpR
+9287356207356vpR
+0.189274385967238956872354vpR
+12389467137496823.134567829387456283946vpR
+.0000000000000000000000000000123vpR
+1vpR
diff --git a/testsuite/dc_sqrt_results.txt b/testsuite/dc_sqrt_results.txt
new file mode 100644
index 000000000..5ded8c294
--- /dev/null
+++ b/testsuite/dc_sqrt_results.txt
@@ -0,0 +1,13 @@
+0
+1.41421356237309504880
+2.00000000000000000000
+3.00000000000000000000
+4.00000000000000000000
+5.00000000000000000000
+11.00000000000000000000
+220.82798735667542192643
+3047516.39985021245496456781
+.435056761776252544285578
+111307983.260397019622398608908
+.0000000000000035071355833500363
+1.00000000000000000000
diff --git a/testsuite/dc_strings.dc b/testsuite/dc_strings.dc
new file mode 100644
index 000000000..2f6b38d88
--- /dev/null
+++ b/testsuite/dc_strings.dc
@@ -0,0 +1,37 @@
+[Hello, World!]ZpR
+[Hello, World!]pR
+[Hello, \[ World!]ZpR
+[Hello, \[ World!]pR
+[Hello, \] World!]ZpR
+[Hello, \] World!]pR
+[30pR]
+[29pR]
+[28pR]
+[27pR]
+[26pR]
+[25pR]
+[24pR]
+[23pR]
+[22pR]
+[21pR]
+[20pR]
+[19pR]
+[18pR]
+[17pR]
+[16pR]
+[15pR]
+[14pR]
+[13pR]
+[12pR]
+[11pR]
+[10pR]
+[9pR]
+[8pR]
+[7pR]
+[6pR]
+[5pR]
+[4pR]
+[3pR]
+[2pR]
+[1pR]
+[xz0<x]dsxx
diff --git a/testsuite/dc_strings_results.txt b/testsuite/dc_strings_results.txt
new file mode 100644
index 000000000..e49b9b288
--- /dev/null
+++ b/testsuite/dc_strings_results.txt
@@ -0,0 +1,36 @@
+13
+Hello, World!
+Hello, \[ World!]ZpR
+[Hello, \[ World!]pR
+[Hello, \] World!]ZpR
+[Hello, \] World!
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
diff --git a/testsuite/dc_subtract.dc b/testsuite/dc_subtract.dc
new file mode 100644
index 000000000..2cb4104fb
--- /dev/null
+++ b/testsuite/dc_subtract.dc
@@ -0,0 +1,33 @@
+0 0-pR
+0 1-pR
+1 0-pR
+1 1-pR
+5 2-pR
+2 9-pR
+321974 12845976238457-pR
+2874519803456710938465 384723854-pR
+10000000000000000000000000000000000000000 999999999999999999999999999999999999999-pR
+10000000000000000000000000000000000000000 9999999999999999999999999999999999999999-pR
+10000000000000000000000000000000000000000 999999999999999999999999999999999999999.99999999999999999999999999999999999-pR
+10000000000000000000000000000000000000000 9999999999999999999999999999999999999999.9999999999999999999999999999999999-pR
+10000000000000000000000000000000000000000 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000001-pR
+10000000000000000000000000000000000000001 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000001-pR
+10000000000000000000000000000000000000000.0000000001 0.0000000000000000000000000000000000000000000000000000000000000000000000000001-pR
+_2 6-pR
+_23784692345 182934721309467230894628735496027345-pR
+_224352354962873059862 _1245723576829456278354960278345-pR
+_3468273598 _12354243-pR
+_0.92345768293 _2354768923-pR
+_712384634.123476823 _24768293376-pR
+_1879234638 _0.917234869234-pR
+_0.9172438692134 _0.971284967124-pR
+_0.1283475123465 _0.937462346-pR
+_124765829346.2837468293562 _0.923467829346-pR
+_12476829385769 _1928476259034.8378629356-pR
+_0.38476284395876345 _94875394587623.2357869324857-pR
+_4674596708467.34754789403674343567 _48672394852354698.237548629345-pR
+979519669 3018100865-pR
+929002449 3280677283-pR
+0 _525898-pR
+3 _3-pR
+2 _1 2893714 _2189367411289 _.8921374 3.9201384----pR
diff --git a/testsuite/dc_subtract_results.txt b/testsuite/dc_subtract_results.txt
new file mode 100644
index 000000000..9f7726254
--- /dev/null
+++ b/testsuite/dc_subtract_results.txt
@@ -0,0 +1,37 @@
+0
+-1
+1
+0
+3
+-7
+-12845975916483
+2874519803456326214611
+9000000000000000000000000000000000000001
+1
+9000000000000000000000000000000000000000.000000000000000000000000000\
+00000001
+.0000000000000000000000000000000001
+9999999999999999999999999999999999999999.999999999999999999999999999\
+99999999999999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.99999999999999999999999999\
+999999999999999999999999999999999999999999999999999999999999
+10000000000000000000000000000000000000000.00000000009999999999999999\
+99999999999999999999999999999999999999999999999999
+-8
+-182934721309467230894628759280719690
+1245723576605103923392087218483
+-3455919355
+2354768922.07654231707
+24055908741.876523177
+-1879234637.082765130766
+.0540410979106
+.8091148336535
+-124765829345.3602790000102
+-10548353126734.1621370644
+94875394587622.85102408852693655
+48667720255646230.89000073530825656433
+-2038581196
+-2351674834
+525898
+6
+-2189370304999.1877242
diff --git a/testsuite/dcx_vars.dc b/testsuite/dcx_vars.dc
new file mode 100644
index 000000000..bbe73b47d
--- /dev/null
+++ b/testsuite/dcx_vars.dc
@@ -0,0 +1,2 @@
+298734.8921702348sx_928374892.28937syzpRlxly+pR
+298734.8921702348S xotj _928374892.28937S yotp zpRl xotj l yotp-pRzpR L xotj L yotp-pR
diff --git a/testsuite/dcx_vars_results.txt b/testsuite/dcx_vars_results.txt
new file mode 100644
index 000000000..6f18e7a84
--- /dev/null
+++ b/testsuite/dcx_vars_results.txt
@@ -0,0 +1,6 @@
+0
+-928076157.3971997652
+0
+928673627.1815402348
+0
+928673627.1815402348
diff --git a/testsuite/head.tests b/testsuite/head.tests
index 50660d267..97bf889d8 100755
--- a/testsuite/head.tests
+++ b/testsuite/head.tests
@@ -31,10 +31,12 @@ testing "head -n <positive number>" \
         "line 1\nline 2\n" \
         "" ""
 
+optional FEATURE_FANCY_HEAD
 testing "head -n <negative number>" \
         "head -n -9 head.input" \
         "line 1\nline 2\nline 3\n" \
         "" ""
+SKIP=
 
 rm head.input
 
diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
index af53de9df..e198dfc4b 100755
--- a/testsuite/unzip.tests
+++ b/testsuite/unzip.tests
@@ -31,10 +31,10 @@ rmdir foo
 rm foo.zip
 
 # File containing some damaged encrypted stream
-optional FEATURE_UNZIP_CDF
+optional FEATURE_UNZIP_CDF CONFIG_UNICODE_SUPPORT
 testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
 "Archive:  bad.zip
-  inflating: ]3j½r«IK-%Ix
+  inflating: ]3j½r«I??K-%Ix
 unzip: corrupted data
 unzip: inflate error
 1
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 4f491fa14..7274b6866 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config ACPID
-//config:       bool "acpid (8.7 kb)"
+//config:       bool "acpid (9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c
index e4902e5b5..a77c7d057 100644
--- a/util-linux/blkdiscard.c
+++ b/util-linux/blkdiscard.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config BLKDISCARD
-//config:       bool "blkdiscard (5.3 kb)"
+//config:       bool "blkdiscard (4.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index a56b69661..008ae5d9e 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config BLKID
-//config:       bool "blkid (11 kb)"
+//config:       bool "blkid (12 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select VOLUMEID
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index e53ade995..5d8e465b4 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config BLOCKDEV
-//config:       bool "blockdev (2.4 kb)"
+//config:       bool "blockdev (2.3 kb)"
 //config:       default y
 //config:       help
 //config:       Performs some ioctls with block devices.
diff --git a/util-linux/cal.c b/util-linux/cal.c
index a4a20d5f0..006bc817b 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -11,7 +11,7 @@
  * Major size reduction... over 50% (>1.5k) on i386.
  */
 //config:config CAL
-//config:       bool "cal (6.5 kb)"
+//config:       bool "cal (5.8 kb)"
 //config:       default y
 //config:       help
 //config:       cal is used to display a monthly calendar.
diff --git a/util-linux/chrt.c b/util-linux/chrt.c
index 45459d940..28e65457c 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHRT
-//config:       bool "chrt (4.4 kb)"
+//config:       bool "chrt (4.7 kb)"
 //config:       default y
 //config:       help
 //config:       Manipulate real-time attributes of a process.
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 6da9d9f4e..b797c7b2a 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config DMESG
-//config:       bool "dmesg (3.5 kb)"
+//config:       bool "dmesg (3.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/eject.c b/util-linux/eject.c
index 6c30facd2..749e2c986 100644
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -13,7 +13,7 @@
  * Most of the dirty work blatantly ripped off from cat.c =)
  */
 //config:config EJECT
-//config:       bool "eject (4.1 kb)"
+//config:       bool "eject (4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
index 8542586dc..3935e7c9b 100644
--- a/util-linux/fallocate.c
+++ b/util-linux/fallocate.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FALLOCATE
-//config:       bool "fallocate (5 kb)"
+//config:       bool "fallocate (4.1 kb)"
 //config:       default y
 //config:       help
 //config:       Preallocate space for files.
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 11cb20cb2..699a19372 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -12,7 +12,7 @@
  *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
  */
 //config:config FBSET
-//config:       bool "fbset (5.8 kb)"
+//config:       bool "fbset (5.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index c72da8b89..ff3bc4870 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FDFORMAT
-//config:       bool "fdformat (4.5 kb)"
+//config:       bool "fdformat (4.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 288b9235f..58e93bb92 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FDISK
-//config:       bool "fdisk (41 kb)"
+//config:       bool "fdisk (37 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index 1102eeff5..7ca9dc96b 100644
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FINDFS
-//config:       bool "findfs (11 kb)"
+//config:       bool "findfs (12 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select VOLUMEID
diff --git a/util-linux/flock.c b/util-linux/flock.c
index dd0bfd430..130627e93 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -4,7 +4,7 @@
  * This is free software, licensed under the GNU General Public License v2.
  */
 //config:config FLOCK
-//config:       bool "flock (6.1 kb)"
+//config:       bool "flock (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       Manage locks from shell scripts
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 6752e49d8..d27113d97 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FDFLUSH
-//config:       bool "fdflush (1.4 kb)"
+//config:       bool "fdflush (1.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -22,7 +22,7 @@
 //config:       leave this disabled.
 //config:
 //config:config FREERAMDISK
-//config:       bool "freeramdisk (1.4 kb)"
+//config:       bool "freeramdisk (1.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index c4612f251..f523da945 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -86,7 +86,7 @@
  * enforced (but it's not much fun on a character device :-).
  */
 //config:config FSCK_MINIX
-//config:       bool "fsck_minix"
+//config:       bool "fsck.minix (13 kb)"
 //config:       default y
 //config:       help
 //config:       The minix filesystem is a nice, small, compact, read-write filesystem
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index c485810aa..fb0b3c4bd 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FSFREEZE
-//config:       bool "fsfreeze (3.6 kb)"
+//config:       bool "fsfreeze (3.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select LONG_OPTS
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 558a94a9e..48948e839 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FSTRIM
-//config:       bool "fstrim (5.5 kb)"
+//config:       bool "fstrim (4.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 4431a7e74..1666d3d30 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -29,7 +29,7 @@
  *  Replaced our_malloc with xmalloc and our_realloc with xrealloc
  */
 //config:config GETOPT
-//config:       bool "getopt (5.6 kb)"
+//config:       bool "getopt (5.8 kb)"
 //config:       default y
 //config:       help
 //config:       The getopt utility is used to break up (parse) options in command
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 719feaf4e..065b83980 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config HEXDUMP
-//config:       bool "hexdump (8.8 kb)"
+//config:       bool "hexdump (8.6 kb)"
 //config:       default y
 //config:       help
 //config:       The hexdump utility is used to display binary data in a readable
@@ -26,7 +26,7 @@
 //config:       aimed to be portable.
 //config:
 //config:config HD
-//config:       bool "hd (8 kb)"
+//config:       bool "hd (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       hd is an alias to hexdump -C.
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index 5b9664d25..daf64d537 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IONICE
-//config:       bool "ionice (3.6 kb)"
+//config:       bool "ionice (3.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index a93ceee11..3d3ad0b56 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCRM
-//config:       bool "ipcrm (2.9 kb)"
+//config:       bool "ipcrm (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       The ipcrm utility allows the removal of System V interprocess
diff --git a/util-linux/last.c b/util-linux/last.c
index f5ee8e5f4..689aa7a34 100644
--- a/util-linux/last.c
+++ b/util-linux/last.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config LAST
-//config:       bool "last (6.2 kb)"
+//config:       bool "last (6.1 kb)"
 //config:       default y
 //config:       depends on FEATURE_WTMP
 //config:       help
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 6b171d710..bf480e9bf 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOSETUP
-//config:       bool "losetup (5.4 kb)"
+//config:       bool "losetup (5.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 0000fbfda..a6b4e850f 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSPCI
-//config:       bool "lspci (5.7 kb)"
+//config:       bool "lspci (6.3 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index 33639413a..e27aa7f31 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSUSB
-//config:       bool "lsusb (3.5 kb)"
+//config:       bool "lsusb (4.2 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 4b4eeafba..63b55536a 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MDEV
-//config:       bool "mdev (16 kb)"
+//config:       bool "mdev (17 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -808,6 +808,16 @@ static void make_device(char *device_name, char *path, int operation)
         } /* for (;;) */
 }
 
+static ssize_t readlink2(char *buf, size_t bufsize)
+{
+        // Grr... gcc 8.1.1:
+        // "passing argument 2 to restrict-qualified parameter aliases with argument 1"
+        // dance around that...
+        char *obuf FIX_ALIASING;
+        obuf = buf;
+        return readlink(buf, obuf, bufsize);
+}
+
 /* File callback for /sys/ traversal.
  * We act only on "/sys/.../dev" (pseudo)file
  */
@@ -831,7 +841,7 @@ static int FAST_FUNC fileAction(const char *fileName,
         /* Read ".../subsystem" symlink in the same directory where ".../dev" is */
         strcpy(subsys, path);
         strcpy(subsys + len, "/subsystem");
-        res = readlink(subsys, subsys, sizeof(subsys)-1);
+        res = readlink2(subsys, sizeof(subsys)-1);
         if (res > 0) {
                 subsys[res] = '\0';
                 free(G.subsystem);
diff --git a/util-linux/mesg.c b/util-linux/mesg.c
index 35c4ec13d..c7b696853 100644
--- a/util-linux/mesg.c
+++ b/util-linux/mesg.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MESG
-//config:       bool "mesg (1.2 kb)"
+//config:       bool "mesg (1.4 kb)"
 //config:       default y
 //config:       help
 //config:       Mesg controls access to your terminal by others. It is typically
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index bda168f1e..845ba0a24 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -8,14 +8,14 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKE2FS
-//config:       bool "mke2fs (9.7 kb)"
+//config:       bool "mke2fs (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Utility to create EXT2 filesystems.
 //config:
 //config:config MKFS_EXT2
-//config:       bool "mkfs.ext2 (9.8 kb)"
+//config:       bool "mkfs.ext2 (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 69dfcd123..e191acbd0 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -63,7 +63,7 @@
  *      removed getopt based parser and added a hand rolled one.
  */
 //config:config MKFS_MINIX
-//config:       bool "mkfs_minix"
+//config:       bool "mkfs.minix (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 6a6dc652f..b760fb2aa 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -8,14 +8,14 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKDOSFS
-//config:       bool "mkdosfs (6.8 kb)"
+//config:       bool "mkdosfs (7.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Utility to create FAT32 filesystems.
 //config:
 //config:config MKFS_VFAT
-//config:       bool "mkfs.vfat (6.8 kb)"
+//config:       bool "mkfs.vfat (7.2 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 2eb16bd84..38413606d 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MKSWAP
-//config:       bool "mkswap (5.8 kb)"
+//config:       bool "mkswap (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       The mkswap utility is used to configure a file or disk partition as
diff --git a/util-linux/more.c b/util-linux/more.c
index fafc80403..a9ea76ab4 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -14,7 +14,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MORE
-//config:       bool "more (6.7 kb)"
+//config:       bool "more (7 kb)"
 //config:       default y
 //config:       help
 //config:       more is a simple utility which allows you to read text one screen
diff --git a/util-linux/mount.c b/util-linux/mount.c
index fa2e7b114..526b4130c 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -18,7 +18,7 @@
 //
 
 //config:config MOUNT
-//config:       bool "mount (30 kb)"
+//config:       bool "mount (23 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/mountpoint.c b/util-linux/mountpoint.c
index 6b21a5fb3..a44cf6013 100644
--- a/util-linux/mountpoint.c
+++ b/util-linux/mountpoint.c
@@ -9,7 +9,7 @@
  * Based on sysvinit's mountpoint
  */
 //config:config MOUNTPOINT
-//config:       bool "mountpoint (4.5 kb)"
+//config:       bool "mountpoint (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       mountpoint checks if the directory is a mountpoint.
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index ae8103a52..4eeaa9f3e 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NSENTER
-//config:       bool "nsenter (8.6 kb)"
+//config:       bool "nsenter (6.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index d6a26b912..41f29da32 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PIVOT_ROOT
-//config:       bool "pivot_root (898 bytes)"
+//config:       bool "pivot_root (1.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 5ec795208..70f829e7f 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RDATE
-//config:       bool "rdate (6 kb)"
+//config:       bool "rdate (5.6 kb)"
 //config:       default y
 //config:       help
 //config:       The rdate utility allows you to synchronize the date and time of your
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 97279ce61..d6b515ebc 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config RDEV
-//config:       bool "rdev (1.4 kb)"
+//config:       bool "rdev (1.8 kb)"
 //config:       default y
 //config:       help
 //config:       Print the device node associated with the filesystem mounted at '/'.
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 219c0c18c..cab2c4319 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -32,7 +32,7 @@
  * Paul Mundt <lethal@linux-sh.org>.
  */
 //config:config READPROFILE
-//config:       bool "readprofile (7.2 kb)"
+//config:       bool "readprofile (7.1 kb)"
 //config:       default y
 //config:       #select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/renice.c b/util-linux/renice.c
index ee0fb3c8e..a318ffce0 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -18,7 +18,7 @@
  *   following IDs (if any).  Multiple switches are allowed.
  */
 //config:config RENICE
-//config:       bool "renice (3.8 kb)"
+//config:       bool "renice (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       Renice alters the scheduling priority of one or more running
diff --git a/util-linux/rev.c b/util-linux/rev.c
index c90b4bbaf..31800fa51 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config REV
-//config:       bool "rev (4.5 kb)"
+//config:       bool "rev (4.4 kb)"
 //config:       default y
 //config:       help
 //config:       Reverse lines of a file or files.
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 8ffa4f3a6..29c440b82 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -23,7 +23,7 @@
  * That flag should not be needed on systems with adjtime support.
  */
 //config:config RTCWAKE
-//config:       bool "rtcwake (6.4 kb)"
+//config:       bool "rtcwake (6.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/script.c b/util-linux/script.c
index aac77c3ba..4eac5e94f 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SCRIPT
-//config:       bool "script (8 kb)"
+//config:       bool "script (8.6 kb)"
 //config:       default y
 //config:       help
 //config:       The script makes typescript of terminal session.
diff --git a/util-linux/scriptreplay.c b/util-linux/scriptreplay.c
index e3083ab93..3c032eec5 100644
--- a/util-linux/scriptreplay.c
+++ b/util-linux/scriptreplay.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SCRIPTREPLAY
-//config:       bool "scriptreplay (2.6 kb)"
+//config:       bool "scriptreplay (2.4 kb)"
 //config:       default y
 //config:       help
 //config:       This program replays a typescript, using timing information
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index 520865318..57051a683 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETARCH
-//config:       bool "setarch (3.4 kb)"
+//config:       bool "setarch (3.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -17,14 +17,14 @@
 //config:       (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 //config:
 //config:config LINUX32
-//config:       bool "linux32 (3.2 kb)"
+//config:       bool "linux32 (3.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Alias to "setarch linux32".
 //config:
 //config:config LINUX64
-//config:       bool "linux64 (3.2 kb)"
+//config:       bool "linux64 (3.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index af079fae8..b69b8cbb6 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETPRIV
-//config:       bool "setpriv (3.4 kb)"
+//config:       bool "setpriv (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select LONG_OPTS
diff --git a/util-linux/setsid.c b/util-linux/setsid.c
index 8385a9115..cdad8c1d3 100644
--- a/util-linux/setsid.c
+++ b/util-linux/setsid.c
@@ -14,7 +14,7 @@
  * - busyboxed
  */
 //config:config SETSID
-//config:       bool "setsid (3.9 kb)"
+//config:       bool "setsid (3.6 kb)"
 //config:       default y
 //config:       help
 //config:       setsid runs a program in a new session
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index f432ce180..567869cc7 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SWAPON
-//config:       bool "swapon (4.9 kb)"
+//config:       bool "swapon (15 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
@@ -34,7 +34,7 @@
 //config:       Enable support for setting swap device priority in swapon.
 //config:
 //config:config SWAPOFF
-//config:       bool "swapoff (4.3 kb)"
+//config:       bool "swapoff (14 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 947dd0cdc..ae9d412d1 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SWITCH_ROOT
-//config:       bool "switch_root (5.2 kb)"
+//config:       bool "switch_root (5.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index 67df1cb73..ed8878ad4 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TASKSET
-//config:       bool "taskset (4.1 kb)"
+//config:       bool "taskset (4.2 kb)"
 //config:       default y
 //config:       help
 //config:       Retrieve or set a processes's CPU affinity.
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 7ff866cec..761743f45 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UEVENT
-//config:       bool "uevent (3.2 kb)"
+//config:       bool "uevent (3.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/umount.c b/util-linux/umount.c
index e2329f8b3..077b635c8 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UMOUNT
-//config:       bool "umount (4.5 kb)"
+//config:       bool "umount (5.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index fffee28a0..61fc71197 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UNSHARE
-//config:       bool "unshare (9.2 kb)"
+//config:       bool "unshare (7.2 kb)"
 //config:       default y
 //config:       depends on !NOMMU
 //config:       select PLATFORM_LINUX
diff --git a/util-linux/wall.c b/util-linux/wall.c
index 939736592..23fb87517 100644
--- a/util-linux/wall.c
+++ b/util-linux/wall.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WALL
-//config:       bool "wall (2.5 kb)"
+//config:       bool "wall (2.6 kb)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help