fix some bug

Author: extrame

ole.go

@@ -45,7 +45,9 @@ func (o *Ole) ListDir() (dir []*File, err error) {
 		} else {
 			break
 		}
-
+	}
+	if err == io.EOF && dir != nil {
+		return dir, nil
 	}
 
 	return

stream_reader.go

@@ -32,15 +32,15 @@ func (r *StreamReader) Read(p []byte) (n int, err error) {
 		}
 		pos := r.ole.sector_pos(r.offset_of_sector, r.size_sector) + r.offset_in_sector
 		p[i] = r.ole.bts[pos]
-		if DEBUG {
-			log.Printf("pos:%x,bit:%x", pos, p[i])
-		}
 		r.offset_in_sector++
 		r.offset++
 		if r.offset == int64(r.size) {
 			return i + 1, io.EOF
 		}
 	}
+	if DEBUG {
+		log.Printf("pos:%x,bit:% X", r.offset_of_sector, p)
+	}
 	return len(p), nil
 }
 

stream_reader_test.go

@@ -45,3 +45,31 @@ func TestSeek(t *testing.T) {
 	fmt.Println(r.Seek(2, 1))
 	fmt.Println(r.Seek(2, 1))
 }
+
+func TestSeek(t *testing.T) {
+	bts := make([]byte, 1<<10)
+	for i := 0; i < 1<<10; i++ {
+		bts[i] = byte(i)
+	}
+	ole := &Ole{nil, 8, 1, []uint32{2, 1, ENDOFCHAIN}, []uint32{}, []File{}, bts}
+	r := ole.stream_read(0, 30)
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+	fmt.Println(r.Seek(2, 1))
+}