1 (#29)

diff --git a/file/FileWR.go b/file/FileWR.go
index feba8462319caa84811ddc3fe536ca80314e5ec8..3c39b9743ca73f0079812eae649958aacb1f7986 100644 (file)
--- a/file/FileWR.go
+++ b/file/FileWR.go
@@ -118,8 +118,13 @@ func New(filePath string, curIndex int64, autoClose bool) *File {
        }
 }
 
-func (t *File) InRoot(root string) *File {
+func (t *File) CheckRoot(root string) *File {
        t.Config.root = root
+       if rel, e := filepath.Rel(root, t.Config.FilePath); e != nil {
+               panic(e)
+       } else {
+               t.Config.FilePath = rel
+       }
        return t
 }
 

diff --git a/file/FileWR_test.go b/file/FileWR_test.go
index 4ebddfd600282ab965a4a756156fca8b2fc3829a..8a8104d1e3f777fde0e61c83f1a9dc33160a2087 100644 (file)
--- a/file/FileWR_test.go
+++ b/file/FileWR_test.go
@@ -308,8 +308,11 @@ func TestCreate(t *testing.T) {
 
 func TestIsRoot(t *testing.T) {
        sf := New("../t.txt", 0, true)
-       sf.InRoot("testdata")
+       sf.CheckRoot("testdata")
        if !strings.HasSuffix(sf.Delete().Error(), "path escapes from parent") {
                t.Fatal()
        }
+
+       sf = New("testdata/1.txt", 0, true).CheckRoot("testdata")
+       t.Log(sf.IsExist())
 }