*: fix various kinds of damage to letter 'c' in Arkadiusz Mickiewicz' surname.

chrt,taskset,dc,eject: shrink crontab: call "vi" with just name, no path watchdog: intercept all fatal signals function old new delta xstrtoull_range - 35 +35 static.sg_commands - 18 +18 packed_usage 23698 23712 +14 watchdog_main 148 151 +3 crontab_main 637 638 +1 base 1 - -1 static.ps 4 - -4 pointer 4 - -4 stack_machine 99 92 -7 run_command 273 260 -13 eject_main 360 343 -17 static.C 30 12 -18 ptok 61 38 -23 xstrtol_range 27 - -27 get_token 35 - -35 taskset_main 586 550 -36 chrt_main 411 372 -39 dc_main 158 117 -41 time_main 1127 1037 -90 ------------------------------------------------------------------------------ (add/remove: 2/5 grow/shrink: 3/9 up/down: 71/-355) Total: -284 bytes text data bss dec hex filename 793680 662 7420 801762 c3be2 busybox_old 793327 662 7412 801401 c3a79 busybox_unstripped
author: Denis Vlasenko <vda.linux@googlemail.com> 2008-03-17 09:29:43 +0000
committer: Denis Vlasenko <vda.linux@googlemail.com> 2008-03-17 09:29:43 +0000
commit: b44c790e41e281965955a83408f35ea53ecdb3d2 (patch)
tree: 98514dba64f7b74b9d60882bfeca1e2c4976b033 /miscutils/dc.c
parent: d25c33f186c7cf3618c34ce79af94fe156f9ab02 (diff)
download: busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.tar.gz
busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.tar.bz2
busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.zip
1 files changed, 43 insertions, 51 deletions
diff --git a/miscutils/dc.c b/miscutils/dc.c
index ffc3f8df4..68ecd8a3f 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -8,11 +8,18 @@
 /* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
-enum { STACK_SIZE = COMMON_BUFSIZE / sizeof(double) };
-#define stack ((double*)&bb_common_bufsiz1)
+struct globals {
-static unsigned int pointer;
+        unsigned pointer;
-static unsigned char base;
+        unsigned base;
+        double stack[1];
+};
+enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(double) };
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define pointer   (G.pointer   )
+#define base      (G.base      )
+#define stack     (G.stack     )
 static void push(double a)
 {
@@ -61,34 +68,34 @@ static void divide(void)
 static void mod(void)
 {
-        unsigned int d = pop();
+        unsigned d = pop();
-        push((unsigned int) pop() % d);
+        push((unsigned) pop() % d);
 }
 static void and(void)
 {
-        push((unsigned int) pop() & (unsigned int) pop());
+        push((unsigned) pop() & (unsigned) pop());
 }
 static void or(void)
 {
-        push((unsigned int) pop() | (unsigned int) pop());
+        push((unsigned) pop() | (unsigned) pop());
 }
 static void eor(void)
 {
-        push((unsigned int) pop() ^ (unsigned int) pop());
+        push((unsigned) pop() ^ (unsigned) pop());
 }
 static void not(void)
 {
-        push(~(unsigned int) pop());
+        push(~(unsigned) pop());
 }
 static void set_output_base(void)
 {
-        base = (unsigned char)pop();
+        base = (unsigned)pop();
        if ((base != 10) && (base != 16)) {
                bb_error_msg("error, base %d is not supported", base);
                base = 10;
@@ -98,14 +105,14 @@ static void set_output_base(void)
 static void print_base(double print)
 {
        if (base == 16)
-                printf("%x\n", (unsigned int)print);
+                printf("%x\n", (unsigned)print);
        else
                printf("%g\n", print);
 }
 static void print_stack_no_pop(void)
 {
-        unsigned int i = pointer;
+        unsigned i = pointer;
        while (i)
                print_base(stack[--i]);
 }
@@ -142,12 +149,12 @@ static const struct op operators[] = {
        {"p", print_no_pop},
        {"f", print_stack_no_pop},
        {"o", set_output_base},
-        {"", 0}
+        { /* zero filled */ }
 };
 static void stack_machine(const char *argument)
 {
-        char *endPointer = 0;
+        char *endPointer;
        double d;
        const struct op *o = operators;
@@ -176,54 +183,39 @@ static void stack_machine(const char *argument)
 */
 static char *get_token(char **buffer)
 {
-        char *start = NULL;
+        char *current = skip_whitespace(*buffer);
-        char *current;
+        if (*current != '\0') {
+                *buffer = skip_non_whitespace(current);
-        current = skip_whitespace(*buffer);
+                return current;
-        if (*current != 0) {
-                start = current;
-                current = skip_non_whitespace(current);
-                *buffer = current;
        }
-        return start;
+        return NULL;
-}
-/* In Perl one might say, scalar m|\s*(\S+)\s*|g */
-static int number_of_tokens(char *buffer)
-{
-        int   i = 0;
-        char *b = buffer;
-        while (get_token(&b)) { i++; }
-        return i;
 }
 int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dc_main(int argc, char **argv)
+int dc_main(int argc ATTRIBUTE_UNUSED, char **argv)
-{
+{
-        /* take stuff from stdin if no args are given */
+        argv++;
-        if (argc <= 1) {
+        if (!argv[0]) {
-                int i, len;
+                /* take stuff from stdin if no args are given */
-                char *line   = NULL;
+                char *line;
-                char *cursor = NULL;
+                char *cursor;
-                char *token  = NULL;
+                char *token;
-                while ((line = xmalloc_getline(stdin))) {
+                while ((line = xmalloc_getline(stdin)) != NULL) {
                        cursor = line;
-                        len = number_of_tokens(line);
+                        while (1) {
-                        for (i = 0; i < len; i++) {
                                token = get_token(&cursor);
-                                *cursor++ = 0;
+                                if (!token) break;
+                                *cursor++ = '\0';
                                stack_machine(token);
                        }
                        free(line);
                }
        } else {
-                if (*argv[1] == '-')
+                if (argv[0][0] == '-')
                        bb_show_usage();
-                while (argc >= 2) {
+                do {
-                        stack_machine(argv[1]);
+                        stack_machine(*argv);
-                        argv++;
+                } while (*++argv);
-                        argc--;
-                }
        }
        return EXIT_SUCCESS;
 }
author	Denis Vlasenko <vda.linux@googlemail.com>	2008-03-17 09:29:43 +0000
committer	Denis Vlasenko <vda.linux@googlemail.com>	2008-03-17 09:29:43 +0000
commit	b44c790e41e281965955a83408f35ea53ecdb3d2 (patch)
tree	98514dba64f7b74b9d60882bfeca1e2c4976b033 /miscutils/dc.c
parent	d25c33f186c7cf3618c34ce79af94fe156f9ab02 (diff)
download	busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.tar.gz busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.tar.bz2 busybox-w32-b44c790e41e281965955a83408f35ea53ecdb3d2.zip

diff --git a/miscutils/dc.c b/miscutils/dc.c index ffc3f8df4..68ecd8a3f 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c
@@ -8,11 +8,18 @@
8		8
9	/* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */	9	/* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
10		10
11	enum { STACK_SIZE = COMMON_BUFSIZE / sizeof(double) };
12		11
13	#define stack ((double*)&bb_common_bufsiz1)	12	struct globals {
14	static unsigned int pointer;	13	unsigned pointer;
15	static unsigned char base;	14	unsigned base;
		15	double stack[1];
		16	};
		17	enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(double) };
		18	#define G ((struct globals)&bb_common_bufsiz1)
		19	#define pointer (G.pointer )
		20	#define base (G.base )
		21	#define stack (G.stack )
		22
16		23
17	static void push(double a)	24	static void push(double a)
18	{	25	{
@@ -61,34 +68,34 @@ static void divide(void)
61		68
62	static void mod(void)	69	static void mod(void)
63	{	70	{
64	unsigned int d = pop();	71	unsigned d = pop();
65		72
66	push((unsigned int) pop() % d);	73	push((unsigned) pop() % d);
67	}	74	}
68		75
69	static void and(void)	76	static void and(void)
70	{	77	{
71	push((unsigned int) pop() & (unsigned int) pop());	78	push((unsigned) pop() & (unsigned) pop());
72	}	79	}
73		80
74	static void or(void)	81	static void or(void)
75	{	82	{
76	push((unsigned int) pop() \| (unsigned int) pop());	83	push((unsigned) pop() \| (unsigned) pop());
77	}	84	}
78		85
79	static void eor(void)	86	static void eor(void)
80	{	87	{
81	push((unsigned int) pop() ^ (unsigned int) pop());	88	push((unsigned) pop() ^ (unsigned) pop());
82	}	89	}
83		90
84	static void not(void)	91	static void not(void)
85	{	92	{
86	push(~(unsigned int) pop());	93	push(~(unsigned) pop());
87	}	94	}
88		95
89	static void set_output_base(void)	96	static void set_output_base(void)
90	{	97	{
91	base = (unsigned char)pop();	98	base = (unsigned)pop();
92	if ((base != 10) && (base != 16)) {	99	if ((base != 10) && (base != 16)) {
93	bb_error_msg("error, base %d is not supported", base);	100	bb_error_msg("error, base %d is not supported", base);
94	base = 10;	101	base = 10;
@@ -98,14 +105,14 @@ static void set_output_base(void)
98	static void print_base(double print)	105	static void print_base(double print)
99	{	106	{
100	if (base == 16)	107	if (base == 16)
101	printf("%x\n", (unsigned int)print);	108	printf("%x\n", (unsigned)print);
102	else	109	else
103	printf("%g\n", print);	110	printf("%g\n", print);
104	}	111	}
105		112
106	static void print_stack_no_pop(void)	113	static void print_stack_no_pop(void)
107	{	114	{
108	unsigned int i = pointer;	115	unsigned i = pointer;
109	while (i)	116	while (i)
110	print_base(stack[--i]);	117	print_base(stack[--i]);
111	}	118	}
@@ -142,12 +149,12 @@ static const struct op operators[] = {
142	{"p", print_no_pop},	149	{"p", print_no_pop},
143	{"f", print_stack_no_pop},	150	{"f", print_stack_no_pop},
144	{"o", set_output_base},	151	{"o", set_output_base},
145	{"", 0}	152	{ /* zero filled */ }
146	};	153	};
147		154
148	static void stack_machine(const char *argument)	155	static void stack_machine(const char *argument)
149	{	156	{
150	char *endPointer = 0;	157	char *endPointer;
151	double d;	158	double d;
152	const struct op *o = operators;	159	const struct op *o = operators;
153		160
@@ -176,54 +183,39 @@ static void stack_machine(const char *argument)
176	*/	183	*/
177	static char get_token(char *buffer)	184	static char get_token(char *buffer)
178	{	185	{
179	char *start = NULL;	186	char current = skip_whitespace(buffer);
180	char *current;	187	if (*current != '\0') {
181		188	*buffer = skip_non_whitespace(current);
182	current = skip_whitespace(*buffer);	189	return current;
183	if (*current != 0) {
184	start = current;
185	current = skip_non_whitespace(current);
186	*buffer = current;
187	}	190	}
188	return start;	191	return NULL;
189	}
190
191	/* In Perl one might say, scalar m\|\s(\S+)\s\|g */
192	static int number_of_tokens(char *buffer)
193	{
194	int i = 0;
195	char *b = buffer;
196	while (get_token(&b)) { i++; }
197	return i;
198	}	192	}
199		193
200	int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	194	int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
201	int dc_main(int argc, char **argv)	195	int dc_main(int argc ATTRIBUTE_UNUSED, char **argv)
202	{	196	{
203	/* take stuff from stdin if no args are given */	197	argv++;
204	if (argc <= 1) {	198	if (!argv[0]) {
205	int i, len;	199	/* take stuff from stdin if no args are given */
206	char *line = NULL;	200	char *line;
207	char *cursor = NULL;	201	char *cursor;
208	char *token = NULL;	202	char *token;
209	while ((line = xmalloc_getline(stdin))) {	203	while ((line = xmalloc_getline(stdin)) != NULL) {
210	cursor = line;	204	cursor = line;
211	len = number_of_tokens(line);	205	while (1) {
212	for (i = 0; i < len; i++) {
213	token = get_token(&cursor);	206	token = get_token(&cursor);
214	*cursor++ = 0;	207	if (!token) break;
		208	*cursor++ = '\0';
215	stack_machine(token);	209	stack_machine(token);
216	}	210	}
217	free(line);	211	free(line);
218	}	212	}
219	} else {	213	} else {
220	if (*argv[1] == '-')	214	if (argv[0][0] == '-')
221	bb_show_usage();	215	bb_show_usage();
222	while (argc >= 2) {	216	do {
223	stack_machine(argv[1]);	217	stack_machine(*argv);
224	argv++;	218	} while (*++argv);
225	argc--;
226	}
227	}	219	}
228	return EXIT_SUCCESS;	220	return EXIT_SUCCESS;
229	}	221	}