From 5e4e7490e5d8569541b5d85ffb80704ece20454a Mon Sep 17 00:00:00 2001
From: zouxu <izouxv@gmail.com>
Date: Sat, 29 Jun 2024 22:00:37 +0800
Subject: [PATCH] os synlink use related path

---
 basepath.go     |  6 +++++-
 os.go           | 14 ++++++++++++--
 symlink_test.go |  3 ++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/basepath.go b/basepath.go
index 2e72793a..5872a6ab 100644
--- a/basepath.go
+++ b/basepath.go
@@ -216,7 +216,11 @@ func (b *BasePathFs) ReadlinkIfPossible(name string) (string, error) {
 		return "", &os.PathError{Op: "readlink", Path: name, Err: err}
 	}
 	if reader, ok := b.source.(LinkReader); ok {
-		return reader.ReadlinkIfPossible(name)
+		srcPath, err := reader.ReadlinkIfPossible(name)
+		if err != nil {
+			return "", err
+		}
+		return strings.TrimPrefix(srcPath, filepath.Clean(b.path)), nil
 	}
 	return "", &os.PathError{Op: "readlink", Path: name, Err: ErrNoReadlink}
 }
diff --git a/os.go b/os.go
index f1366321..94c8977c 100644
--- a/os.go
+++ b/os.go
@@ -16,6 +16,7 @@ package afero
 
 import (
 	"os"
+	"path/filepath"
 	"time"
 )
 
@@ -105,9 +106,18 @@ func (OsFs) LstatIfPossible(name string) (os.FileInfo, bool, error) {
 }
 
 func (OsFs) SymlinkIfPossible(oldname, newname string) error {
-	return os.Symlink(oldname, newname)
+	relpath, err := filepath.Rel(newname, oldname)
+	if err != nil {
+		return &os.LinkError{Op: "symlink", Old: oldname, New: newname, Err: err}
+	}
+	return os.Symlink(relpath, newname)
 }
 
 func (OsFs) ReadlinkIfPossible(name string) (string, error) {
-	return os.Readlink(name)
+	path, err := os.Readlink(name)
+	if err != nil {
+		return "", err
+	}
+	pathAbs := filepath.Clean(filepath.Join(name, path))
+	return pathAbs, nil
 }
diff --git a/symlink_test.go b/symlink_test.go
index 77dd742f..004d8f43 100644
--- a/symlink_test.go
+++ b/symlink_test.go
@@ -132,7 +132,7 @@ func TestReadlinkIfPossible(t *testing.T) {
 	}
 
 	testRead := func(r LinkReader, name string, output *string) {
-		_, err := r.ReadlinkIfPossible(name)
+		str, err := r.ReadlinkIfPossible(name)
 		if (err != nil) && (output == nil) {
 			t.Fatalf("Error reading link, expected success, got error: %v", err)
 		} else if (err == nil) && (output != nil) {
@@ -140,6 +140,7 @@ func TestReadlinkIfPossible(t *testing.T) {
 		} else if err != nil && err.Error() != *output && !strings.HasSuffix(err.Error(), *output) {
 			t.Fatalf("Error reading link, expected error '%v', instead received '%v'", *output, err)
 		}
+		t.Logf("str: %v", str)
 	}
 
 	notSupported := ErrNoReadlink.Error()