Replace syscall.Unlink with os.Remove so that the directory(e.g. /run/docker.sock/) can be deleted

keloyang · keloyang · commit e37f6db96f63 · 2020-08-24T16:52:14.000+08:00
Signed-off-by: Shukui Yang &lt;keloyangsk@gmail.com&gt;
Signed-off-by: Shukui Yang &lt;jryangshukui@jd.com&gt;
diff --git a/sockets/unix_socket.go b/sockets/unix_socket.go
@@ -79,7 +79,7 @@ func WithChmod(mask os.FileMode) SockOption {
 
 // NewUnixSocketWithOpts creates a unix socket with the specified options
 func NewUnixSocketWithOpts(path string, opts ...SockOption) (net.Listener, error) {
-	if err := syscall.Unlink(path); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
 	mask := syscall.Umask(0777)

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func WithChmod(mask os.FileMode) SockOption {`
`79`	`79`
`80`	`80`	`// NewUnixSocketWithOpts creates a unix socket with the specified options`
`81`	`81`	`func NewUnixSocketWithOpts(path string, opts ...SockOption) (net.Listener, error) {`
`82`		`- if err := syscall.Unlink(path); err != nil && !os.IsNotExist(err) {`
	`82`	`+ if err := os.Remove(path); err != nil && !os.IsNotExist(err) {`
`83`	`83`	`return nil, err`
`84`	`84`	`}`
`85`	`85`	`mask := syscall.Umask(0777)`