Fixes #2

pkg/bspatch/bspatch.go

@@ -173,7 +173,7 @@ func patchb(oldfile, patch []byte) ([]byte, error) {
 
 		// Read diff string
 		// lenread, err = dpfbz2.Read(pnew[newpos : newpos+ctrl[0]])
-		lenread, err = bzreadall(dpfbz2, pnew[newpos:newpos+ctrl[0]], ctrl[0])
+		lenread, err = zreadall(dpfbz2, pnew[newpos:newpos+ctrl[0]], ctrl[0])
 		if lenread < ctrl[0] || (err != nil && err != io.EOF) {
 			e0 := ""
 			if err != nil {
@@ -199,8 +199,8 @@ func patchb(oldfile, patch []byte) ([]byte, error) {
 
 		// Read extra string
 		// epfbz2.Read was not reading all the requested bytes, probably an internal buffer limitation ?
-		// it was encapsulated by bzreadall to work around the issue
-		lenread, err = bzreadall(epfbz2, pnew[newpos:newpos+ctrl[1]], ctrl[1])
+		// it was encapsulated by zreadall to work around the issue
+		lenread, err = zreadall(epfbz2, pnew[newpos:newpos+ctrl[1]], ctrl[1])
 		if lenread < ctrl[1] || (err != nil && err != io.EOF) {
 			e0 := ""
 			if err != nil {
@@ -258,7 +258,7 @@ func offtin(buf []byte) int {
 	return y
 }
 
-func bzreadall(r io.Reader, b []byte, expected int) (int, error) {
+func zreadall(r io.Reader, b []byte, expected int) (int, error) {
 	var allread int
 	var offset int
 	for {

pkg/bspatch/bspatch_test.go

@@ -266,7 +266,7 @@ func (r *lowcaprdr) Read(b []byte) (int, error) {
 	return len(b), nil
 }
 
-func TestBZReadAll(t *testing.T) {
+func TestZReadAll(t *testing.T) {
 	buf := []byte{
 		0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20,
 		0x30, 0x30, 0x30, 0x30, 0x40, 0x40, 0x40, 0x40,
@@ -275,7 +275,7 @@ func TestBZReadAll(t *testing.T) {
 	rr := &lowcaprdr{
 		read: make([]byte, 1024),
 	}
-	nr, err := bzreadall(rr, buf, len(buf))
+	nr, err := zreadall(rr, buf, len(buf))
 	if err != nil {
 		t.Fail()
 	}