commit c55b00ed2c1f097119c88d9d295e2d71fca1549e from: Omar Polo date: Fri Dec 31 13:04:36 2021 UTC fork the library commit - 37d97cf40d03aece9a223d23bf1c8216c824bd90 commit + c55b00ed2c1f097119c88d9d295e2d71fca1549e blob - daf913b1b347aae6de6f48d599bc89ef8c8693d6 blob + 8c1cda158b0f10c01447fcf3c7ffa94cfa7e5c7d --- .gitignore +++ .gitignore @@ -1,24 +1,2 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test -*.prof +cmd/9pr/9pr +cmd/9ps/9ps blob - ef1fd583cc7e0292e4df45add0710de88ad4db78 blob + 33fd82ad3e7a26b24f9473344800467e6de961f3 --- README.md +++ README.md @@ -1,13 +1,19 @@ -# p9p [![GoDoc](https://godoc.org/github.com/docker/go-p9p?status.svg)](https://godoc.org/github.com/docker/go-p9p) [![Apache licensed](https://img.shields.io/badge/license-Apache-blue.svg)](https://raw.githubusercontent.com/docker/go-p9p/master/LICENSE) [![CircleCI](https://circleci.com/gh/docker/go-p9p.svg?style=shield)](https://circleci.com/gh/docker/go-p9p) [![TravisCI](https://travis-ci.org/docker/go-p9p.svg?branch=master)](https://travis-ci.org/docker/go-p9p) [![Go Report Card](https://goreportcard.com/badge/github.com/docker/go-p9p)](https://goreportcard.com/report/github.com/docker/go-p9p) [![Badge Badge](http://doyouevenbadge.com/github.com/docker/go-p9p)](http://doyouevenbadge.com/report/github.com/docker/go-p9p) +# p9p - A modern, performant 9P library for Go. -For information on usage, please see the [GoDoc](https://godoc.org/github.com/docker/go-p9p). +For information on usage, please see the +[GoDoc](https://godocs.io/git.omarpolo.com/go-p9p). -Refer to [9P's documentation](http://9p.cat-v.org/documentation) for more details on the protocol. +Refer to [9P's documentation](http://9p.cat-v.org/documentation) +for more details on the protocol. ## Copyright and license -Copyright © 2015 Docker, Inc. go-p9p is licensed under the Apache License, -Version 2.0. See [LICENSE](LICENSE) for the full license text. +This library was forked from +[github.com/docker-archive/go-p9p][docker-go-p9p] and contains +further improvements. + +Copyright © 2015 Docker, Inc. go-p9p is licensed under the Apache +License, Version 2.0. See [LICENSE](LICENSE) for the full license +text. blob - 9fb4de3e9f6ce5d4c3222c661ba240fd44aa3096 blob + 555617b42ad4fdedf15a2ae84d9f78a6e38ba55b --- cmd/9pr/main.go +++ cmd/9pr/main.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "context" "flag" "fmt" "io" @@ -15,9 +16,8 @@ import ( "text/tabwriter" "time" + "git.omarpolo.com/go-p9p" "github.com/chzyer/readline" - "github.com/docker/go-p9p" - "golang.org/x/net/context" ) var addr string blob - /dev/null blob + 1fcf3afda9cf066e511a454a40630e46dac0ae61 (mode 644) --- /dev/null +++ cmd/9pr/go.mod @@ -0,0 +1,12 @@ +module git.omarpolo.com/go-p9p/cmd/9pr + +replace git.omarpolo.com/go-p9p => ../../ + +go 1.17 + +require ( + git.omarpolo.com/go-p9p v0.0.0-00010101000000-000000000000 + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e +) + +require golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect blob - /dev/null blob + f021e976585bf9fd1c0799c57ba36385f86992c3 (mode 644) --- /dev/null +++ cmd/9pr/go.sum @@ -0,0 +1,14 @@ +github.com/chzyer/logex v1.2.0 h1:+eqR0HfOetur4tgnC8ftU5imRnhi4te+BadWS95c5AM= +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23 h1:dZ0/VyGgQdVGAss6Ju0dt5P0QltE0SFY5Woh6hbIfiQ= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03/go.mod h1:GDue7j/yh3AtNoUK0ihznL9JiZVn92CV9bUrYaD4NOc= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= blob - 34896bc6282b030c3e75848c5a945c2ead6b25be blob + aad3c346e772bfb48f6b14c03e01ae2ce40e5de6 --- cmd/9ps/main.go +++ cmd/9ps/main.go @@ -1,14 +1,14 @@ package main import ( + "context" "flag" "log" "net" "strings" - "github.com/docker/go-p9p" - "github.com/docker/go-p9p/ufs" - "golang.org/x/net/context" + "git.omarpolo.com/go-p9p" + "git.omarpolo.com/go-p9p/ufs" ) var ( blob - /dev/null blob + 39f6435fc7cf15086e4305ee6b05ed129f988c68 (mode 644) --- /dev/null +++ cmd/9ps/go.mod @@ -0,0 +1,12 @@ +module git.omarpolo.com/go-p9p/cmd/9ps + +replace git.omarpolo.com/go-p9p => ../.. + +replace git.omarpolo.com/go-p9p/ufs => ../../ufs + +go 1.17 + +require ( + git.omarpolo.com/go-p9p v0.0.0-00010101000000-000000000000 + git.omarpolo.com/go-p9p/ufs v0.0.0-00010101000000-000000000000 +) blob - /dev/null blob + 0b2abe0d4dad2e3d2b6e006da9cbf2a1967c2868 (mode 644) --- /dev/null +++ cmd/9ps/go.sum @@ -0,0 +1,10 @@ +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03/go.mod h1:GDue7j/yh3AtNoUK0ihznL9JiZVn92CV9bUrYaD4NOc= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= blob - /dev/null blob + dcec6d5da8c8682ba26dd6837b3d2f63af82ef85 (mode 644) --- /dev/null +++ go.mod @@ -0,0 +1,15 @@ +module git.omarpolo.com/go-p9p + +go 1.17 + +require ( + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e + github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03 + golang.org/x/net v0.0.0-20211216030914-fe4d6282115f +) + +require ( + github.com/chzyer/logex v1.2.0 // indirect + github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect + golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect +) blob - /dev/null blob + 21f0536d6ec864290b738aa6c6b4da6dd54d1bce (mode 644) --- /dev/null +++ go.sum @@ -0,0 +1,16 @@ +github.com/chzyer/logex v1.2.0 h1:+eqR0HfOetur4tgnC8ftU5imRnhi4te+BadWS95c5AM= +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23 h1:dZ0/VyGgQdVGAss6Ju0dt5P0QltE0SFY5Woh6hbIfiQ= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03 h1:HiIKimWyR71ORJgvm/aWL/cqeYMpOy4eObwJogG8FAw= +github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03/go.mod h1:GDue7j/yh3AtNoUK0ihznL9JiZVn92CV9bUrYaD4NOc= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= blob - 143cad902fed1b41ba8d96d840ddde3d2092887d blob + 92f5f7bbb93e174b3f3bc6c7d4ae034866e3e78d --- ufs/fileref.go +++ ufs/fileref.go @@ -4,7 +4,7 @@ import ( "os" "sync" - p9p "github.com/docker/go-p9p" + p9p "git.omarpolo.com/go-p9p" ) type FileRef struct { blob - 5fd27ee2d96390c6e5a693acc20dd40c19ed4f63 blob + 75726727a7bfde5a958e5744e9f22b977899f4a4 --- ufs/session.go +++ ufs/session.go @@ -11,7 +11,7 @@ import ( "sync" "syscall" - "github.com/docker/go-p9p" + "git.omarpolo.com/go-p9p" ) type session struct { blob - /dev/null blob + fa597983c290df2110bac43142f2cc4c9e4cf25f (mode 644) --- /dev/null +++ ufs/go.mod @@ -0,0 +1,7 @@ +module git.omarpolo.com/go-p9p/ufs + +replace git.omarpolo.com/go-p9p => ../ + +go 1.17 + +require git.omarpolo.com/go-p9p v0.0.0-00010101000000-000000000000 blob - e20fd5bedcc5dc73923443f22ee84a73eb6e8758 blob + 50d1efb1486f9d1d2100f06f012520d0db92b334 --- ufs/util.go +++ ufs/util.go @@ -4,7 +4,7 @@ import ( "os" "syscall" - p9p "github.com/docker/go-p9p" + p9p "git.omarpolo.com/go-p9p" ) func dirFromInfo(info os.FileInfo) p9p.Dir { blob - /dev/null blob + 0b2abe0d4dad2e3d2b6e006da9cbf2a1967c2868 (mode 644) --- /dev/null +++ ufs/go.sum @@ -0,0 +1,10 @@ +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/docker/go-p9p v0.0.0-20191112112554-37d97cf40d03/go.mod h1:GDue7j/yh3AtNoUK0ihznL9JiZVn92CV9bUrYaD4NOc= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=