Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chgserver: extract utility to bind unix domain socket to long path
authorYuya Nishihara <yuya@tcha.org>
Sat, 21 May 2016 16:52:04 +0900
changeset 29530 3239e2fdd2e2
parent 29529 02de1dbd4f6e
child 29531 b439a2a268eb
chgserver: extract utility to bind unix domain socket to long path This is common problem of using sockaddr_un.
hgext/chgserver.py file | annotate | diff | comparison | revisions
mercurial/posix.py file | annotate | diff | comparison | revisions
mercurial/util.py file | annotate | diff | comparison | revisions
mercurial/windows.py file | annotate | diff | comparison | revisions 
--- a/hgext/chgserver.py	Sat May 21 16:42:59 2016 +0900
+++ b/hgext/chgserver.py	Sat May 21 16:52:04 2016 +0900
@@ -578,18 +578,7 @@
         # use a unique temp address so we can stat the file and do ownership
         # check later
         tempaddress = _tempaddress(self.server_address)
-        # use relative path instead of full path at bind() if possible, since
-        # AF_UNIX path has very small length limit (107 chars) on common
-        # platforms (see sys/un.h)
-        dirname, basename = os.path.split(tempaddress)
-        bakwdfd = None
-        if dirname:
-            bakwdfd = os.open('.', os.O_DIRECTORY)
-            os.chdir(dirname)
-        self.socket.bind(basename)
-        if bakwdfd:
-            os.fchdir(bakwdfd)
-            os.close(bakwdfd)
+        util.bindunixsocket(self.socket, tempaddress)
         self._socketstat = os.stat(tempaddress)
         # rename will replace the old socket file if exists atomically. the
         # old server will detect ownership change and exit.
--- a/mercurial/posix.py	Sat May 21 16:42:59 2016 +0900
+++ b/mercurial/posix.py	Sat May 21 16:52:04 2016 +0900
@@ -598,3 +598,18 @@
         return ''.join(chunks)
     finally:
         fcntl.fcntl(pipe, fcntl.F_SETFL, oldflags)
+
+def bindunixsocket(sock, path):
+    """Bind the UNIX domain socket to the specified path"""
+    # use relative path instead of full path at bind() if possible, since
+    # AF_UNIX path has very small length limit (107 chars) on common
+    # platforms (see sys/un.h)
+    dirname, basename = os.path.split(path)
+    bakwdfd = None
+    if dirname:
+        bakwdfd = os.open('.', os.O_DIRECTORY)
+        os.chdir(dirname)
+    sock.bind(basename)
+    if bakwdfd:
+        os.fchdir(bakwdfd)
+        os.close(bakwdfd)
--- a/mercurial/util.py	Sat May 21 16:42:59 2016 +0900
+++ b/mercurial/util.py	Sat May 21 16:52:04 2016 +0900
@@ -70,6 +70,7 @@
 
 _ = i18n._
 
+bindunixsocket = platform.bindunixsocket
 cachestat = platform.cachestat
 checkexec = platform.checkexec
 checklink = platform.checklink
--- a/mercurial/windows.py	Sat May 21 16:42:59 2016 +0900
+++ b/mercurial/windows.py	Sat May 21 16:52:04 2016 +0900
@@ -471,3 +471,6 @@
         chunks.append(s)
 
     return ''.join(chunks)
+
+def bindunixsocket(sock, path):
+    raise NotImplementedError('unsupported platform')
mercurial