Merge pull request #135 from djs55/remove-named-pipe

Remove broken named pipe support
mirage · Jun 14, 2018 · 2d1c4db · 2d1c4db
2 parents 7ef32cc + 0076852
commit 2d1c4db
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+## v0.12.1 (2018-06-14)
+
+* Remove (broken) support for named pipes.
+* Remove unnecessary dependency on `cmdliner` in the core library.
+
 ## v0.12.0 (2017-11-05)
 
 * Remove unnecessary dependency on `ppx_deriving`

diff --git a/lib_test/jbuild b/lib_test/jbuild
@@ -3,7 +3,7 @@
 (executables
  ((names (lofs_test tests))
   (libraries (result cstruct alcotest lwt cstruct-lwt logs.fmt astring
-              named-pipe.lwt mirage-flow-lwt mirage-kv-lwt mirage-channel-lwt
+              mirage-flow-lwt mirage-kv-lwt mirage-channel-lwt
               protocol-9p protocol-9p-unix))
 ))
 (alias

diff --git a/protocol-9p-unix.opam b/protocol-9p-unix.opam
@@ -26,9 +26,7 @@ depends: [
   "mirage-channel-lwt"
   "lwt" {>= "3.0.0"}
   "base-unix"
-  "cmdliner"
   "astring"
-  "named-pipe" {>= "0.4.0"}
   "fmt"
   "logs" {>= "0.5.0"}
   "win-error"

diff --git a/protocol-9p.opam b/protocol-9p.opam
@@ -22,9 +22,7 @@ depends: [
   "mirage-kv-lwt"
   "mirage-channel-lwt"
   "lwt" {>= "3.0.0"}
-  "cmdliner"
   "astring"
-  "named-pipe" {>= "0.4.0"}
   "fmt"
   "logs" {>= "0.5.0"}
   "win-error"

diff --git a/unix/client9p_unix.ml b/unix/client9p_unix.ml
@@ -107,10 +107,6 @@ module Make(Log: S.LOG) = struct
         end
       | "unix", _ ->
         open_unix address
-      | _, address when Astring.String.is_prefix ~affix:"\\\\" address ->
-        Named_pipe_lwt.Client.openpipe address
-        >>= fun pipe ->
-        Lwt.return (Ok (Named_pipe_lwt.Client.to_fd pipe))
       | _ ->
         Lwt.return (Error.error_msg "Unknown protocol %s" proto)
     ) >>*= fun s ->

diff --git a/unix/jbuild b/unix/jbuild
@@ -3,6 +3,6 @@
 (library
  ((name        protocol_9p_unix)
   (public_name protocol-9p-unix)
-  (libraries   (result fmt lwt mirage-flow-lwt cstruct cstruct-lwt astring named-pipe.lwt
+  (libraries   (result fmt lwt mirage-flow-lwt cstruct cstruct-lwt astring
                 protocol-9p io-page.unix prometheus))
 ))