@@ -25,7 +25,9 @@ import (
2525 "flag"
2626 "fmt"
2727 "io"
28+ "math"
2829 "os"
30+ "strconv"
2931 "strings"
3032
3133 "github.com/ethereum/go-ethereum/common"
3739 reverseMode = flag .Bool ("reverse" , false , "convert ASCII to rlp" )
3840 noASCII = flag .Bool ("noascii" , false , "don't print ASCII strings readably" )
3941 single = flag .Bool ("single" , false , "print only the first element, discard the rest" )
42+ showpos = flag .Bool ("pos" , false , "display element byte posititions" )
4043)
4144
4245func init () {
@@ -52,31 +55,37 @@ If the filename is omitted, data is read from stdin.`)
5255func main () {
5356 flag .Parse ()
5457
55- var r io. Reader
58+ var r * inStream
5659 switch {
5760 case * hexMode != "" :
5861 data , err := hex .DecodeString (strings .TrimPrefix (* hexMode , "0x" ))
5962 if err != nil {
6063 die (err )
6164 }
62- r = bytes .NewReader (data )
65+ r = newInStream ( bytes .NewReader (data ), int64 ( len ( data )) )
6366
6467 case flag .NArg () == 0 :
65- r = os .Stdin
68+ r = newInStream ( bufio . NewReader ( os .Stdin ), 0 )
6669
6770 case flag .NArg () == 1 :
6871 fd , err := os .Open (flag .Arg (0 ))
6972 if err != nil {
7073 die (err )
7174 }
7275 defer fd .Close ()
73- r = fd
76+ var size int64
77+ finfo , err := fd .Stat ()
78+ if err == nil {
79+ size = finfo .Size ()
80+ }
81+ r = newInStream (bufio .NewReader (fd ), size )
7482
7583 default :
7684 fmt .Fprintln (os .Stderr , "Error: too many arguments" )
7785 flag .Usage ()
7886 os .Exit (2 )
7987 }
88+
8089 out := os .Stdout
8190 if * reverseMode {
8291 data , err := textToRlp (r )
@@ -93,10 +102,10 @@ func main() {
93102 }
94103}
95104
96- func rlpToText (r io. Reader , out io.Writer ) error {
97- s := rlp .NewStream (r , 0 )
105+ func rlpToText (in * inStream , out io.Writer ) error {
106+ stream := rlp .NewStream (in , 0 )
98107 for {
99- if err := dump (s , 0 , out ); err != nil {
108+ if err := dump (in , stream , 0 , out ); err != nil {
100109 if err != io .EOF {
101110 return err
102111 }
@@ -110,7 +119,10 @@ func rlpToText(r io.Reader, out io.Writer) error {
110119 return nil
111120}
112121
113- func dump (s * rlp.Stream , depth int , out io.Writer ) error {
122+ func dump (in * inStream , s * rlp.Stream , depth int , out io.Writer ) error {
123+ if * showpos {
124+ fmt .Fprintf (out , "%s: " , in .posLabel ())
125+ }
114126 kind , size , err := s .Kind ()
115127 if err != nil {
116128 return err
@@ -137,7 +149,7 @@ func dump(s *rlp.Stream, depth int, out io.Writer) error {
137149 if i > 0 {
138150 fmt .Fprint (out , ",\n " )
139151 }
140- if err := dump (s , depth + 1 , out ); err == rlp .EOL {
152+ if err := dump (in , s , depth + 1 , out ); err == rlp .EOL {
141153 break
142154 } else if err != nil {
143155 return err
@@ -208,3 +220,36 @@ func textToRlp(r io.Reader) ([]byte, error) {
208220 data , err := rlp .EncodeToBytes (obj [0 ])
209221 return data , err
210222}
223+
224+ type inStream struct {
225+ br rlp.ByteReader
226+ pos int
227+ columns int
228+ }
229+
230+ func newInStream (br rlp.ByteReader , totalSize int64 ) * inStream {
231+ col := int (math .Ceil (math .Log10 (float64 (totalSize ))))
232+ return & inStream {br : br , columns : col }
233+ }
234+
235+ func (rc * inStream ) Read (b []byte ) (n int , err error ) {
236+ n , err = rc .br .Read (b )
237+ rc .pos += n
238+ return n , err
239+ }
240+
241+ func (rc * inStream ) ReadByte () (byte , error ) {
242+ b , err := rc .br .ReadByte ()
243+ if err == nil {
244+ rc .pos ++
245+ }
246+ return b , err
247+ }
248+
249+ func (rc * inStream ) posLabel () string {
250+ l := strconv .FormatInt (int64 (rc .pos ), 10 )
251+ if len (l ) < rc .columns {
252+ l = strings .Repeat (" " , rc .columns - len (l )) + l
253+ }
254+ return l
255+ }
0 commit comments