httpd: support for "I:index.xml" syntax (Peter Korsgaard <jacmet@uclibc.org>)

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

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 2121f7669a581e137e8b74dddb7d5840be169b47..ffc3f8df4ea7f327eb448fd257e5615d2982cd04 100644 (file)
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -3,23 +3,20 @@
  * 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 "libbb.h"
 #include <math.h>
 
 /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
 
-static double stack[100];
+enum { STACK_SIZE = COMMON_BUFSIZE / sizeof(double) };
+
+#define stack ((double*)&bb_common_bufsiz1)
 static unsigned int pointer;
 static unsigned char base;
 
 static void push(double a)
 {
-       if (pointer >= (sizeof(stack) / sizeof(*stack)))
+       if (pointer >= STACK_SIZE)
                bb_error_msg_and_die("stack overflow");
        stack[pointer++] = a;
 }
@@ -91,10 +88,10 @@ 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;
+               bb_error_msg("error, base %d is not supported", base);
+               base = 10;
        }
 }
 
@@ -103,12 +100,12 @@ static void print_base(double print)
        if (base == 16)
                printf("%x\n", (unsigned int)print);
        else
-       printf("%g\n", print);
+               printf("%g\n", print);
 }
 
 static void print_stack_no_pop(void)
 {
-       unsigned int i=pointer;
+       unsigned int i = pointer;
        while (i)
                print_base(stack[--i]);
 }
@@ -119,7 +116,7 @@ static void print_no_pop(void)
 }
 
 struct op {
-       const char *name;
+       const char name[4];
        void (*function) (void);
 };
 
@@ -145,7 +142,7 @@ static const struct op operators[] = {
        {"p", print_no_pop},
        {"f", print_stack_no_pop},
        {"o", set_output_base},
-       {0,     0}
+       {"", 0}
 };
 
 static void stack_machine(const char *argument)
@@ -164,9 +161,9 @@ static void stack_machine(const char *argument)
                return;
        }
 
-       while (o->name != 0) {
+       while (o->name[0]) {
                if (strcmp(o->name, argument) == 0) {
-                       (*(o->function)) ();
+                       o->function();
                        return;
                }
                o++;
@@ -185,7 +182,7 @@ static char *get_token(char **buffer)
        current = skip_whitespace(*buffer);
        if (*current != 0) {
                start = current;
-               while (!isspace(*current) && *current != 0) { current++; }
+               current = skip_non_whitespace(current);
                *buffer = current;
        }
        return start;
@@ -200,7 +197,7 @@ static int number_of_tokens(char *buffer)
        return i;
 }
 
-int dc_main(int argc, char **argv);
+int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dc_main(int argc, char **argv)
 {
        /* take stuff from stdin if no args are given */
@@ -220,7 +217,7 @@ int dc_main(int argc, char **argv)
                        free(line);
                }
        } else {
-               if (*argv[1]=='-')
+               if (*argv[1] == '-')
                        bb_show_usage();
                while (argc >= 2) {
                        stack_machine(argv[1]);