etherscan-io
diff --git a/‎request-example.go
Lines changed: 4 additions & 15 deletions b/‎request-example.go
Lines changed: 4 additions & 15 deletions
diff --git a/‎request-server.go
Lines changed: 9 additions & 4 deletions b/‎request-server.go
Lines changed: 9 additions & 4 deletions
@@ -56,7 +56,7 @@ func (fs *root) Filewrite(r *Request) (io.WriterAt, error) {
 	defer fs.filesLock.Unlock()
 	file, err := fs.fetch(r.Filepath)
 	if err == os.ErrNotExist {
-		dir, err := fs.fetch(dir(r.Filepath))
+		dir, err := fs.fetch(filepath.Dir(r.Filepath))
 		if err != nil {
 			return nil, err
 		}
@@ -102,7 +102,7 @@ func (fs *root) Filecmd(r *Request) error {
 			}
 		}
 	case "Rmdir", "Remove":
-		file, err := fs.fetch(dir(r.Filepath))
+		file, err := fs.fetch(filepath.Dir(r.Filepath))
 		if err != nil {
 			return err
 		}
@@ -122,7 +122,7 @@ func (fs *root) Filecmd(r *Request) error {
 		delete(fs.files, r.Filepath)
 
 	case "Mkdir":
-		_, err := fs.fetch(dir(r.Filepath))
+		_, err := fs.fetch(filepath.Dir(r.Filepath))
 		if err != nil {
 			return err
 		}
@@ -183,7 +183,7 @@ func (fs *root) Filelist(r *Request) (ListerAt, error) {
 		}
 		orderedNames := []string{}
 		for fn := range fs.files {
-			if dir(fn) == r.Filepath {
+			if filepath.Dir(fn) == r.Filepath {
 				orderedNames = append(orderedNames, fn)
 			}
 		}
@@ -305,14 +305,3 @@ func (f *memFile) WriteAt(p []byte, off int64) (int, error) {
 func (f *memFile) TransferError(err error) {
 	f.transferError = err
 }
-
-func dir(path string) string {
-	i := len(path) - 1
-	for i >= 0 && !os.IsPathSeparator(path[i]) {
-		i--
-	}
-	if i == 0 {
-		return path[:i+1]
-	}
-	return path[:i]
-}
@@ -190,10 +190,15 @@ func (rs *RequestServer) packetWorker(
 				request = NewRequest("Stat", request.Filepath)
 				rpkt = request.call(rs.Handlers, pkt)
 			}
-		case *sshFxpExtendedPacketPosixRename:
-			request := NewRequest("Rename", pkt.Oldpath)
-			request.Target = pkt.Newpath
-			rpkt = request.call(rs.Handlers, pkt)
+		case *sshFxpExtendedPacket:
+			switch expkt := pkt.SpecificPacket.(type) {
+			default:
+				rpkt = statusFromError(pkt, ErrSSHFxOpUnsupported)
+			case *sshFxpExtendedPacketPosixRename:
+				request := NewRequest("Rename", expkt.Oldpath)
+				request.Target = expkt.Newpath
+				rpkt = request.call(rs.Handlers, pkt)
+			}
 		case hasHandle:
 			handle := pkt.getHandle()
 			request, ok := rs.getRequest(handle)
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (fs root) Filewrite(r Request) (io.WriterAt, error) {`
`56`	`56`	`defer fs.filesLock.Unlock()`
`57`	`57`	`file, err := fs.fetch(r.Filepath)`
`58`	`58`	`if err == os.ErrNotExist {`
`59`		`- dir, err := fs.fetch(dir(r.Filepath))`
	`59`	`+ dir, err := fs.fetch(filepath.Dir(r.Filepath))`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`62`	`62`	`}`
`@@ -102,7 +102,7 @@ func (fs root) Filecmd(r Request) error {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`case "Rmdir", "Remove":`
`105`		`- file, err := fs.fetch(dir(r.Filepath))`
	`105`	`+ file, err := fs.fetch(filepath.Dir(r.Filepath))`
`106`	`106`	`if err != nil {`
`107`	`107`	`return err`
`108`	`108`	`}`
`@@ -122,7 +122,7 @@ func (fs root) Filecmd(r Request) error {`
`122`	`122`	`delete(fs.files, r.Filepath)`
`123`	`123`
`124`	`124`	`case "Mkdir":`
`125`		`- _, err := fs.fetch(dir(r.Filepath))`
	`125`	`+ _, err := fs.fetch(filepath.Dir(r.Filepath))`
`126`	`126`	`if err != nil {`
`127`	`127`	`return err`
`128`	`128`	`}`
`@@ -183,7 +183,7 @@ func (fs root) Filelist(r Request) (ListerAt, error) {`
`183`	`183`	`}`
`184`	`184`	`orderedNames := []string{}`
`185`	`185`	`for fn := range fs.files {`
`186`		`- if dir(fn) == r.Filepath {`
	`186`	`+ if filepath.Dir(fn) == r.Filepath {`
`187`	`187`	`orderedNames = append(orderedNames, fn)`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -305,14 +305,3 @@ func (f *memFile) WriteAt(p []byte, off int64) (int, error) {`
`305`	`305`	`func (f *memFile) TransferError(err error) {`
`306`	`306`	`f.transferError = err`
`307`	`307`	`}`
`308`		`-`
`309`		`-func dir(path string) string {`
`310`		`- i := len(path) - 1`
`311`		`- for i >= 0 && !os.IsPathSeparator(path[i]) {`
`312`		`- i--`
`313`		`- }`
`314`		`- if i == 0 {`
`315`		`- return path[:i+1]`
`316`		`- }`
`317`		`- return path[:i]`
`318`		`-}`