forgot about avn add... :(

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

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 112f6df3ff866ccc3d1834b1810c0cb957f2dd00..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. */
 
@@ -167,7 +171,7 @@ 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
@@ -175,10 +179,10 @@ static void stack_machine(const char *argument)
  */
 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++; }
@@ -204,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++) {
@@ -223,6 +227,5 @@ int dc_main(int argc, char **argv)
                        argc--;
                }
        }
-       stack_machine(0);
        return EXIT_SUCCESS;
 }