stop using __u32 etc. uint32_t is there for a reason

[oweals/busybox.git] / miscutils / dc.c

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 5e367fe6889a3ebbb0f8b67b632b77226833a6b3..7b6405754bcf6398d534a17219e2cc59e4b154d6 100644 (file)
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -1,11 +1,15 @@
 /* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+#include "busybox.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
-#include "busybox.h"
 
 /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
 
@@ -44,6 +48,13 @@ static void mul(void)
        push(pop() * pop());
 }
 
+static void power(void)
+{
+       double topower = pop();
+
+       push(pow(pop(), topower));
+}
+
 static void divide(void)
 {
        double divisor = pop();
@@ -51,6 +62,13 @@ static void divide(void)
        push(pop() / divisor);
 }
 
+static void mod(void)
+{
+       unsigned int d = pop();
+
+       push((unsigned int) pop() % d);
+}
+
 static void and(void)
 {
        push((unsigned int) pop() & (unsigned int) pop());
@@ -73,7 +91,7 @@ static void not(void)
 
 static void set_output_base(void)
 {
-       base=(unsigned char)pop();      
+       base=(unsigned char)pop();
        if ((base != 10) && (base != 16)) {
                fprintf(stderr, "Error: base = %d is not supported.\n", base);
                base=10;
@@ -82,7 +100,7 @@ static void set_output_base(void)
 
 static void print_base(double print)
 {
-       if (base == 16) 
+       if (base == 16)
                printf("%x\n", (unsigned int)print);
        else
        printf("%g\n", print);
@@ -100,11 +118,6 @@ static void print_no_pop(void)
        print_base(stack[pointer-1]);
 }
 
-static void print(void)
-{
-       print_base(pop());
-}
-
 struct op {
        const char *name;
        void (*function) (void);
@@ -119,10 +132,16 @@ static const struct op operators[] = {
        {"mul", mul},
        {"/",   divide},
        {"div", divide},
+       {"**",  power},
+       {"exp", power},
+       {"pow", power},
+       {"%",   mod},
+       {"mod", mod},
        {"and", and},
        {"or",  or},
        {"not", not},
        {"eor", eor},
+       {"xor", eor},
        {"p", print_no_pop},
        {"f", print_stack_no_pop},
        {"o", set_output_base},
@@ -135,10 +154,8 @@ static void stack_machine(const char *argument)
        double d;
        const struct op *o = operators;
 
-       if (argument == 0) {
-               print();
+       if (argument == 0)
                return;
-       }
 
        d = strtod(argument, &endPointer);
 
@@ -154,21 +171,21 @@ static void stack_machine(const char *argument)
                }
                o++;
        }
-       bb_error_msg_and_die("%s: syntax error.", argument);
+       bb_error_msg_and_die("%s: syntax error", argument);
 }
 
 /* return pointer to next token in buffer and set *buffer to one char
- * past the end of the above mentioned token 
+ * past the end of the above mentioned token
  */
 static char *get_token(char **buffer)
 {
-       char *start   = NULL;
-       char *current = *buffer;
+       char *start = NULL;
+       char *current;
 
-       while (isspace(*current)) { current++; }
+       current = skip_whitespace(*buffer);
        if (*current != 0) {
                start = current;
-               while (!isspace(*current) && current != 0) { current++; }
+               while (!isspace(*current) && *current != 0) { current++; }
                *buffer = current;
        }
        return start;
@@ -191,7 +208,7 @@ int dc_main(int argc, char **argv)
                char *line   = NULL;
                char *cursor = NULL;
                char *token  = NULL;
-               while ((line = bb_get_chomped_line_from_file(stdin))) {
+               while ((line = xmalloc_getline(stdin))) {
                        cursor = line;
                        len = number_of_tokens(line);
                        for (i = 0; i < len; i++) {
@@ -210,6 +227,5 @@ int dc_main(int argc, char **argv)
                        argc--;
                }
        }
-       stack_machine(0);
        return EXIT_SUCCESS;
 }