diff options
| -rw-r--r-- | applets/busybox.c | 3 | ||||
| -rw-r--r-- | busybox.c | 3 | ||||
| -rw-r--r-- | dc.c | 10 | ||||
| -rw-r--r-- | docs/busybox.pod | 8 | ||||
| -rw-r--r-- | internal.h | 1 | ||||
| -rw-r--r-- | miscutils/dc.c | 10 |
6 files changed, 14 insertions, 21 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 221ef2a..84629d2 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -189,9 +189,6 @@ const struct BB_applet applets[] = { #ifdef BB_MAKEDEVS {"makedevs", makedevs_main, _BB_DIR_SBIN}, #endif -#ifdef BB_MATH - {"math", math_main, _BB_DIR_USR_BIN}, -#endif #ifdef BB_MD5SUM {"md5sum", md5sum_main, _BB_DIR_USR_BIN}, #endif @@ -189,9 +189,6 @@ const struct BB_applet applets[] = { #ifdef BB_MAKEDEVS {"makedevs", makedevs_main, _BB_DIR_SBIN}, #endif -#ifdef BB_MATH - {"math", math_main, _BB_DIR_USR_BIN}, -#endif #ifdef BB_MD5SUM {"md5sum", md5sum_main, _BB_DIR_USR_BIN}, #endif @@ -8,11 +8,11 @@ /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */ -static const char dc_usage[] = "math expression ...\n" +static const char dc_usage[] = "dc expression ...\n" #ifndef BB_FEATURE_TRIVIAL_HELP "\nThis is a Tiny RPN calculator that understands the\n" "following operations: +, -, /, *, and, or, not, eor.\n" - "i.e. 'math 2 2 add' -> 4, and 'math 8 8 \\* 2 2 + /' -> 16\n" + "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16\n" #endif ; @@ -22,7 +22,7 @@ static unsigned int pointer; static void push(double a) { if (pointer >= (sizeof(stack) / sizeof(*stack))) { - fprintf(stderr, "math: stack overflow\n"); + fprintf(stderr, "dc: stack overflow\n"); exit(-1); } else stack[pointer++] = a; @@ -31,7 +31,7 @@ static void push(double a) static double pop() { if (pointer == 0) { - fprintf(stderr, "math: stack underflow\n"); + fprintf(stderr, "dc: stack underflow\n"); exit(-1); } return stack[--pointer]; @@ -132,7 +132,7 @@ static void stack_machine(const char *argument) } o++; } - fprintf(stderr, "math: %s: syntax error.\n", argument); + fprintf(stderr, "dc: %s: syntax error.\n", argument); exit(-1); } diff --git a/docs/busybox.pod b/docs/busybox.pod index 75763d3..03749ee 100644 --- a/docs/busybox.pod +++ b/docs/busybox.pod @@ -55,11 +55,11 @@ terse runtime description of their behavior. Currently defined functions include: -ar, basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, cut, date, dd, -df, dirname, dmesg, du, dutmp, echo, false, fbset, fdflush, find, free, +ar, basename, cat, chgrp, chmod, chown, chroot, clear, chvt, cp, cut, date, dc, +dd, df, dirname, dmesg, du, dutmp, echo, false, fbset, fdflush, find, free, freeramdisk, deallocvt, fsck.minix, grep, gunzip, gzip, halt, head, hostid, hostname, id, init, kill, killall, length, ln, loadacm, loadfont, loadkmap, -logger, logname, ls, lsmod, makedevs, math, md5sum, mkdir, mkfifo, mkfs.minix, +logger, logname, ls, lsmod, makedevs, md5sum, mkdir, mkfifo, mkfs.minix, mknod, mkswap, mktemp, nc, more, mount, mt, mv, nslookup, ping, poweroff, printf, ps, pwd, reboot, rm, rmdir, rmmod, sed, setkeycodes, sh, sfdisk, sleep, sort, sync, syslogd, swapon, swapoff, tail, tar, test, tee, touch, tr, true, @@ -2024,4 +2024,4 @@ Enrique Zanardi <ezanardi@ull.es> =cut -# $Id: busybox.pod,v 1.44 2000/06/21 19:06:16 beppu Exp $ +# $Id: busybox.pod,v 1.45 2000/06/21 20:17:29 proski Exp $ @@ -152,7 +152,6 @@ extern int logname_main(int argc, char **argv); extern int ls_main(int argc, char** argv); extern int lsmod_main(int argc, char** argv); extern int makedevs_main(int argc, char** argv); -extern int math_main(int argc, char** argv); extern int md5sum_main(int argc, char** argv); extern int mkdir_main(int argc, char** argv); extern int mkfifo_main(int argc, char **argv); diff --git a/miscutils/dc.c b/miscutils/dc.c index 37c7731..31a5471 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c @@ -8,11 +8,11 @@ /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */ -static const char dc_usage[] = "math expression ...\n" +static const char dc_usage[] = "dc expression ...\n" #ifndef BB_FEATURE_TRIVIAL_HELP "\nThis is a Tiny RPN calculator that understands the\n" "following operations: +, -, /, *, and, or, not, eor.\n" - "i.e. 'math 2 2 add' -> 4, and 'math 8 8 \\* 2 2 + /' -> 16\n" + "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16\n" #endif ; @@ -22,7 +22,7 @@ static unsigned int pointer; static void push(double a) { if (pointer >= (sizeof(stack) / sizeof(*stack))) { - fprintf(stderr, "math: stack overflow\n"); + fprintf(stderr, "dc: stack overflow\n"); exit(-1); } else stack[pointer++] = a; @@ -31,7 +31,7 @@ static void push(double a) static double pop() { if (pointer == 0) { - fprintf(stderr, "math: stack underflow\n"); + fprintf(stderr, "dc: stack underflow\n"); exit(-1); } return stack[--pointer]; @@ -132,7 +132,7 @@ static void stack_machine(const char *argument) } o++; } - fprintf(stderr, "math: %s: syntax error.\n", argument); + fprintf(stderr, "dc: %s: syntax error.\n", argument); exit(-1); } |