1303 files changed, 32187 insertions, 57138 deletions
diff --git a/miscutils/dc.c b/miscutils/dc.c index 6bcfbe2..7986fef 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c @@ -2,9 +2,24 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - -#include "libbb.h" -#include <math.h> +//config:config DC +//config: bool "dc" +//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..." @@ -29,6 +44,10 @@ //usage: "$ echo 72 9 div 8 mul p | dc\n" //usage: "64\n" +#include "libbb.h" +#include "common_bufsiz.h" +#include <math.h> + #if 0 typedef unsigned data_t; #define DATA_FMT "" @@ -47,15 +66,22 @@ struct globals { double stack[1]; } FIX_ALIASING; enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(double) }; -#define G (*(struct globals*)&bb_common_bufsiz1) +#define G (*(struct globals*)bb_common_bufsiz1) #define pointer (G.pointer ) #define base (G.base ) #define stack (G.stack ) #define INIT_G() do { \ + setup_common_bufsiz(); \ base = 10; \ } while (0) +static void check_under(void) +{ + if (pointer == 0) + bb_error_msg_and_die("stack underflow"); +} + static void push(double a) { if (pointer >= STACK_SIZE) @@ -65,8 +91,7 @@ static void push(double a) static double pop(void) { - if (pointer == 0) - bb_error_msg_and_die("stack underflow"); + check_under(); return stack[--pointer]; } @@ -187,6 +212,7 @@ static void print_stack_no_pop(void) static void print_no_pop(void) { + check_under(); print_base(stack[pointer-1]); } @@ -196,14 +222,6 @@ struct op { }; static const struct op operators[] = { - {"+", add}, - {"add", add}, - {"-", sub}, - {"sub", sub}, - {"*", mul}, - {"mul", mul}, - {"/", divide}, - {"div", divide}, #if ENABLE_FEATURE_DC_LIBM {"**", power}, {"exp", power}, @@ -216,28 +234,47 @@ static const struct op operators[] = { {"not", not}, {"eor", eor}, {"xor", eor}, + {"+", add}, + {"add", add}, + {"-", sub}, + {"sub", sub}, + {"*", mul}, + {"mul", mul}, + {"/", divide}, + {"div", divide}, {"p", print_no_pop}, {"f", print_stack_no_pop}, {"o", set_output_base}, }; +/* Feed the stack machine */ static void stack_machine(const char *argument) { char *end; - double d; + double number; const struct op *o; - d = strtod(argument, &end); - if (end != argument && *end == '\0') { - push(d); - return; + next: + number = strtod(argument, &end); + if (end != argument) { + argument = end; + push(number); + goto next; } + /* We might have matched a digit, eventually advance the argument */ + argument = skip_whitespace(argument); + + if (*argument == '\0') + return; + o = operators; do { - if (strcmp(o->name, argument) == 0) { + char *after_name = is_prefixed_with(argument, o->name); + if (after_name) { + argument = after_name; o->function(); - return; + goto next; } o++; } while (o != operators + ARRAY_SIZE(operators)); @@ -254,25 +291,11 @@ int dc_main(int argc UNUSED_PARAM, char **argv) if (!argv[0]) { /* take stuff from stdin if no args are given */ char *line; - char *cursor; - char *token; while ((line = xmalloc_fgetline(stdin)) != NULL) { - cursor = line; - while (1) { - token = skip_whitespace(cursor); - if (*token == '\0') - break; - cursor = skip_non_whitespace(token); - if (*cursor != '\0') - *cursor++ = '\0'; - stack_machine(token); - } + stack_machine(line); free(line); } } else { - // why? it breaks "dc -2 2 + p" - //if (argv[0][0] == '-') - // bb_show_usage(); do { stack_machine(*argv); } while (*++argv); |