Mercurial > hg > toybox
annotate toys/od.c @ 622:93ef2516f15a
Fill out od -c and -f.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sat, 14 Jul 2012 00:59:32 -0500 |
parents | 488032f4394a |
children |
rev | line source |
---|---|
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
1 /* vi: set sw=4 ts=4: |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
2 * |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
3 * od.c - Provide octal/hex dumps of data |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
4 * |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
5 * Copyright 2012 Andre Renaud <andre@bluewatersys.com> |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
6 * Copyright 2012 Rob Landley <rob@landley.net> |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
7 * |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
8 * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/od.html |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
9 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
10 USE_OD(NEWTOY(od, "j#vN#xsodcbA:t*", TOYFLAG_USR|TOYFLAG_BIN)) |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
11 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
12 config OD |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
13 bool "od" |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
14 default y |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
15 help |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
16 usage: od [-bdosxv] [-j #] [-N #] [-A doxn] [-t arg] |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
17 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
18 -A Address base (decimal, octal, hexdecimal, none) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
19 -t output type(s) a (ascii) c (char) d (decimal) foux |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
20 */ |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
21 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
22 #include "toys.h" |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
23 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
24 #define FLAG_t (1 << 0) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
25 #define FLAG_A (1 << 1) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
26 #define FLAG_b (1 << 2) |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
27 #define FLAG_c (1 << 3) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
28 #define FLAG_d (1 << 4) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
29 #define FLAG_o (1 << 5) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
30 #define FLAG_s (1 << 6) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
31 #define FLAG_x (1 << 7) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
32 #define FLAG_N (1 << 8) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
33 #define FLAG_v (1 << 9) |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
34 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
35 DEFINE_GLOBALS( |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
36 struct arg_list *output_base; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
37 char *address_base; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
38 long max_count; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
39 long jump_bytes; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
40 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
41 unsigned types, leftover, star, address_idx; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
42 char *buf; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
43 uint64_t bufs[4]; // force 64-bit alignment |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
44 off_t pos; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
45 ) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
46 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
47 #define TT this.od |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
48 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
49 static char *ascii = "nulsohstxetxeotenqackbel bs ht nl vt ff cr so si" |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
50 "dledc1dc2dc3dc4naksynetbcan emsubesc fs gs rs us sp"; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
51 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
52 struct odtype { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
53 int type; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
54 int size; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
55 }; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
56 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
57 static void od_outline(void) |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
58 { |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
59 unsigned flags = toys.optflags; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
60 char *abases[] = {"", "%07d", "%07o", "%06x"}; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
61 struct odtype *types = (struct odtype *)toybuf, *t; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
62 int i, len; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
63 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
64 if (TT.leftover<16) memset(TT.buf+TT.leftover, 0, 16-TT.leftover); |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
65 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
66 // Handle duplciate lines as * |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
67 if (!(flags&FLAG_v) && TT.jump_bytes != TT.pos && TT.leftover |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
68 && !memcmp(TT.bufs, TT.bufs + 2, 16)) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
69 { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
70 if (!TT.star) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
71 xputs("*"); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
72 TT.star++; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
73 } |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
74 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
75 // Print line position |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
76 } else { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
77 TT.star = 0; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
78 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
79 xprintf(abases[TT.address_idx], TT.pos); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
80 if (!TT.leftover) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
81 if (TT.address_idx) xputc('\n'); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
82 return; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
83 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
84 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
85 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
86 TT.pos += len = TT.leftover; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
87 TT.leftover = 0; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
88 if (TT.star) return; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
89 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
90 // For each output type, print one line |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
91 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
92 for (i=0; i<TT.types; i++) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
93 int j = 0, pad = i ? 8 : 0; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
94 char buf[128]; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
95 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
96 t = types+i; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
97 while (j<len) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
98 unsigned k; |
622 | 99 int throw = 0; |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
100 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
101 // Handle ascii |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
102 if (t->type < 2) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
103 char c = TT.buf[j++]; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
104 pad += 4; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
105 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
106 if (!t->type) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
107 c &= 127; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
108 if (c<=32) sprintf(buf, "%.3s", ascii+(3*c)); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
109 else if (c==127) strcpy(buf, "del"); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
110 else sprintf(buf, "%c", c); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
111 } else { |
622 | 112 char *bfnrtav = "\b\f\n\r\t\a\v", *s = strchr(bfnrtav, c); |
113 if (s) sprintf(buf, "\\%c", "bfnrtav0"[s-bfnrtav]); | |
114 else if (c < 32 || c >= 127) sprintf(buf, "%03o", c); | |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
115 else { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
116 // TODO: this should be UTF8 aware. |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
117 sprintf(buf, "%c", c); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
118 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
119 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
120 } else if (CFG_TOYBOX_FLOAT && t->type == 6) { |
622 | 121 long double ld; |
122 union {float f; double d; long double ld;} fdl; | |
123 | |
124 memcpy(&fdl, TT.buf+j, t->size); | |
125 j += t->size; | |
126 if (sizeof(float) == t->size) { | |
127 ld = fdl.f; | |
128 pad += (throw = 8)+7; | |
129 } else if (sizeof(double) == t->size) { | |
130 ld = fdl.d; | |
131 pad += (throw = 17)+8; | |
132 } else if (sizeof(long double) == t->size) { | |
133 ld = fdl.ld; | |
134 pad += (throw = 21)+9; | |
135 } else error_exit("bad -tf '%d'", t->size); | |
136 | |
137 sprintf(buf, "%.*Le", throw, ld); | |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
138 // Integer types |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
139 } else { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
140 unsigned long long ll = 0, or; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
141 char *c[] = {"%*lld", "%*llu", "%0*llo", "%0*llx"}, |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
142 *class = c[t->type-2]; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
143 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
144 // Work out width of field |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
145 if (t->size == 8) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
146 or = -1LL; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
147 if (t->type == 2) or >>= 1; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
148 } else or = (1LL<<(8*t->size))-1; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
149 throw = sprintf(buf, class, 0, or); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
150 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
151 // Accumulate integer based on size argument |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
152 for (k=0; k < t->size; k++) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
153 or = TT.buf[j++]; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
154 ll |= or << (8*(IS_BIG_ENDIAN ? t->size-k-1 : k)); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
155 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
156 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
157 // Handle negative values |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
158 if (t->type == 2) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
159 or = sizeof(or) - t->size; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
160 throw++; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
161 if (or && (ll & (1l<<((8*t->size)-1)))) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
162 ll |= ((or<<(8*or))-1) << (8*t->size); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
163 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
164 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
165 sprintf(buf, class, throw, ll); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
166 pad += throw+1; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
167 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
168 xprintf("%*s", pad, buf); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
169 pad = 0; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
170 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
171 xputc('\n'); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
172 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
173 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
174 // buffer toggle for "same as last time" check. |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
175 TT.buf = (char *)((TT.buf == (char *)TT.bufs) ? TT.bufs+2 : TT.bufs); |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
176 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
177 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
178 static void do_od(int fd, char *name) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
179 { |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
180 // Skip input, possibly more than one entire file. |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
181 if (TT.jump_bytes < TT.pos) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
182 off_t off = lskip(fd, TT.jump_bytes); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
183 if (off > 0) TT.pos += off; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
184 if (TT.jump_bytes < TT.pos) return; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
185 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
186 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
187 for(;;) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
188 char *buf = TT.buf + TT.leftover; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
189 int len = 16 - TT.leftover; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
190 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
191 if (toys.optflags & FLAG_N) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
192 if (!TT.max_count) break; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
193 if (TT.max_count < len) len = TT.max_count; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
194 } |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
195 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
196 len = readall(fd, buf, len); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
197 if (len < 0) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
198 perror_msg("%s", name); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
199 break; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
200 } |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
201 if (TT.max_count) TT.max_count -= len; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
202 TT.leftover += len; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
203 if (TT.leftover < 16) break; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
204 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
205 od_outline(); |
612
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
206 } |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
207 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
208 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
209 static void append_base(char *base) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
210 { |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
211 char *s = base; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
212 struct odtype *types = (struct odtype *)toybuf; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
213 int type; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
214 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
215 for (;;) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
216 int size = 1; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
217 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
218 if (!*s) return; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
219 if (TT.types >= sizeof(toybuf)/sizeof(struct odtype)) break; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
220 if (-1 == (type = stridx("acduox"USE_TOYBOX_FLOAT("f"), *(s++)))) break; |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
221 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
222 if (isdigit(*s)) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
223 size = strtol(s, &s, 10); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
224 if (type < 2 && size != 1) break; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
225 if (CFG_TOYBOX_FLOAT && type == 6 && size == sizeof(long double)); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
226 else if (size < 0 || size > 8) break; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
227 } else if (CFG_TOYBOX_FLOAT && type == 6) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
228 int sizes[] = {sizeof(float), sizeof(double), sizeof(long double)}; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
229 if (-1 == (size = stridx("FDL", *s))) size = sizeof(double); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
230 else { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
231 s++; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
232 size = sizes[size]; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
233 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
234 } else if (type > 1) { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
235 if (-1 == (size = stridx("CSIL", *s))) size = 4; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
236 else { |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
237 s++; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
238 size = 1 << size; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
239 } |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
240 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
241 |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
242 types[TT.types].type = type; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
243 types[TT.types].size = size; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
244 TT.types++; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
245 } |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
246 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
247 error_exit("bad -t %s", base); |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
248 } |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
249 |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
250 void od_main(void) |
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
251 { |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
252 struct arg_list *arg; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
253 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
254 TT.buf = (char *)TT.bufs; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
255 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
256 if (!TT.address_base) TT.address_idx = 2; |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
257 else if (0>(TT.address_idx = stridx("ndox", *TT.address_base))) |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
258 error_exit("bad -A '%c'", *TT.address_base); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
259 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
260 // Collect -t entries |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
261 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
262 for (arg = TT.output_base; arg; arg = arg->next) append_base(arg->arg); |
612
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
263 if (toys.optflags & FLAG_b) append_base("o1"); |
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
264 if (toys.optflags & FLAG_d) append_base("u2"); |
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
265 if (toys.optflags & FLAG_o) append_base("o2"); |
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
266 if (toys.optflags & FLAG_s) append_base("d2"); |
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
267 if (toys.optflags & FLAG_x) append_base("x2"); |
1121e0f42132
Some refactoring, shouldn't affect the generated code.
Rob Landley <rob@landley.net>
parents:
611
diff
changeset
|
268 if (!TT.output_base) append_base("o2"); |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
269 |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
270 loopfiles(toys.optargs, do_od); |
621
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
271 |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
272 if (TT.leftover) od_outline(); |
488032f4394a
Complete rewrite of od, mostly working. (Need to finish -c and -f.)
Rob Landley <rob@landley.net>
parents:
613
diff
changeset
|
273 od_outline(); |
611
c9865aadb9fc
First drop of od, from Andre Renaud.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
274 } |