2 files changed, 96 insertions, 15 deletions

diff --git a/presence.cabal b/presence.cabal
index ee6704a3..e75c1b0e 100644
--- a/presence.cabal
+++ b/presence.cabal
@@ -13,24 +13,104 @@ author: Joe Crayne
 data-dir: ""
  
 executable presence
-    build-depends: base -any, stm -any, text (>=0.11.2.0), xml-types -any, containers -any,
-                   network -any, time -any, transformers -any, resourcet -any, bytestring -any,
-                   mtl -any, mmorph -any, conduit (>=1.0.4), void -any, random -any,
-                   data-default -any, blaze-builder -any, unix -any, conduit-extra -any,
-                   binary -any, directory -any, cpu -any, template-haskell -any, deepseq -any,
-                   filepath -any, hinotify -any, process -any, xml-conduit -any
-    main-is: xmppServer.hs
-    other-modules: ByteStringOperators, ClientState, ConfigFiles, ConnectionKey,
-                   ConsoleWriter, Control.Concurrent.STM.StatusCache,
-                   Control.Concurrent.STM.UpdateStream, ControlMaybe, DNSCache,
-                   Data.BitSyntax, EventUtil, FGConsole, GetHostByAddr,
-                   LocalPeerCred, LockedChan, Logging, Nesting, Paths,
-                   PeerResolve, Server, SockAddr, SocketLike, TraversableT,
-                   UTmp, XMPPServer
     buildable: True
     cpp-options: -DRENDERFLUSH
     c-sources: Presence/monitortty.c
     hs-source-dirs: . Presence
     ghc-prof-options: -DNOUTMP
     ghc-options: -O2 -fwarn-unused-binds -threaded
+    build-depends: base,
+                   binary,
+                   blaze-builder,
+                   bytestring,
+                   conduit (>=1.0.4),
+                   conduit-extra,
+                   containers,
+                   cpu,
+                   data-default,
+                   deepseq,
+                   directory,
+                   filepath,
+                   hinotify,
+                   mmorph,
+                   mtl,
+                   network,
+                   process,
+                   random,
+                   resourcet,
+                   stm,
+                   template-haskell,
+                   text (>=0.11.2.0),
+                   time,
+                   transformers,
+                   unix,
+                   void,
+                   xml-conduit,
+                   xml-types
+    main-is: xmppServer.hs
+    other-modules: ByteStringOperators,
+                   ClientState,
+                   ConfigFiles,
+                   ConnectionKey,
+                   ConsoleWriter,
+                   Control.Concurrent.STM.StatusCache,
+                   Control.Concurrent.STM.UpdateStream,
+                   ControlMaybe,
+                   Data.BitSyntax,
+                   DNSCache,
+                   EventUtil,
+                   FGConsole,
+                   GetHostByAddr,
+                   LocalPeerCred,
+                   LockedChan,
+                   Logging,
+                   Nesting,
+                   Paths,
+                   PeerResolve,
+                   Server,
+                   SockAddr,
+                   SocketLike,
+                   TraversableT,
+                   UTmp,
+                   XMPPServer
  
+executable whosocket
+    main-is: whosocket.hs
+    hs-source-dirs: . Presence
+    cpp-options: -DRENDERFLUSH
+    ghc-options: -O2 -fwarn-unused-binds -threaded
+    build-depends: base,
+                   binary,
+                   bytestring,
+                   containers,
+                   cpu,
+                   deepseq,
+                   directory,
+                   mtl,
+                   network,
+                   template-haskell,
+                   text (>=0.11.2.0),
+                   unix
+    other-modules: ByteStringOperators,
+                   ControlMaybe,
+                   Data.BitSyntax,
+                   LocalPeerCred,
+                   Logging,
+                   Paths,
+                   SockAddr,
+                   SocketLike,
+                   UTmp
+
+-- ConduitServer.hs:main = mainC
+-- Control/Concurrent/STM/StatusCache.hs:-- > main = do q <- atomically $ Cache.new (== '(') (==')')
+-- Control/Concurrent/STM/UpdateStream.hs:-- > main = do
+-- Presence/Server.hs:-- > main = runResourceT $ do
+-- Presence/main.hs:main = do
+-- consolation.hs:main = do
+-- nalias.hs:main = do
+-- nalias2.hs:main = do
+-- pwrite.hs:main = do
+-- simplechat.hs:main = do
+-- test-server.hs:main = do
+-- whosocket.hs:main = do
+-- xmppServer.hs:main = runResourceT $ do
diff --git a/whosocket.hs b/whosocket.hs
index 44926797..f84e3178 100644
--- a/whosocket.hs
+++ b/whosocket.hs
@@ -34,6 +34,7 @@ main = do
         (Just addr_str,Just port_str) -> whosocket addr_str port_str
         _                             -> usage
 
+whosocket :: HostName -> ServiceName -> IO ()
 whosocket addr_str port_str = do
     info <- getAddrInfo (Just $ defaultHints { addrFlags = [ AI_NUMERICHOST ] }) 
                         (Just addr_str) 
@@ -50,7 +51,7 @@ whosocket addr_str port_str = do
         tty_pids = mapMaybe filterTTYs us
 
     tty <- maybe (return Nothing)
-                 (uncurry $ identifyTTY tty_pids)
+                 (fmap fst . uncurry (identifyTTY tty_pids))
                  r
     putStrLn $ "uid = " ++ show (fmap fst r)
     L.putStrLn $ "tty = " <++?> tty