Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/dc.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/dc.c (modified) (8 diffs)

branches/3.3/mindi-busybox/miscutils/dc.c

@@ -5 +5 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <math.h>
 
@@ -48 +49 @@
 } 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)
@@ -66 +74 @@
 static double pop(void)
 {
-    if (pointer == 0)
-        bb_error_msg_and_die("stack underflow");
+    check_under();
     return stack[--pointer];
 }
@@ -188 +195 @@
 static void print_no_pop(void)
 {
+    check_under();
     print_base(stack[pointer-1]);
 }
@@ -197 +205 @@
 
 static const struct op operators[] = {
-    {"+",   add},
-    {"add", add},
-    {"-",   sub},
-    {"sub", sub},
-    {"*",   mul},
-    {"mul", mul},
-    {"/",   divide},
-    {"div", divide},
 #if ENABLE_FEATURE_DC_LIBM
     {"**",  power},
@@ -217 +217 @@
     {"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},
@@ -222 +230 @@
 };
 
+/* 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);
+ 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++;
@@ -255 +274 @@
         /* 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);