[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:52:35 UTC 2010
The following commit has been merged in the master branch:
commit 9ed73b1ad4ce4a9f33c6e67ed56391c549b3decb
Author: John Goerzen <jgoerzen at complete.org>
Date: Tue Dec 21 23:17:59 2004 +0100
Setting up infrastructure for FTP server
Keywords:
(jgoerzen at complete.org--projects/missingh--head--0.7--patch-124)
diff --git a/ChangeLog b/ChangeLog
index 14aab8b..58725ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,28 @@
# arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
#
+2004-12-21 16:17:59 GMT John Goerzen <jgoerzen at complete.org> patch-124
+
+ Summary:
+ Setting up infrastructure for FTP server
+ Revision:
+ missingh--head--0.7--patch-124
+
+
+ new files:
+ libsrc/MissingH/Network/FTP/ParserServer.hs
+
+ modified files:
+ ChangeLog debian/changelog
+ libsrc/MissingH/Network/FTP/Client.hs
+ libsrc/MissingH/Network/FTP/ParserClient.hs
+ libsrc/MissingH/Network/FTP/Server.hs
+
+ renamed files:
+ libsrc/MissingH/Network/FTP/Parser.hs
+ ==> libsrc/MissingH/Network/FTP/ParserClient.hs
+
+
2004-12-21 16:11:44 GMT John Goerzen <jgoerzen at complete.org> patch-123
Summary:
diff --git a/debian/changelog b/debian/changelog
index 3fade2b..566f556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ missingh (0.8.0) unstable; urgency=low
* New HVIO, HVFS modules.
* Expanded MissingH.Path thanks to code from Volker Wysk's
HsShellScript.
+ * Renamed MissingH.Network.FTP.Parser to
+ MissingH.Network.FTP.ParserClient.
+ * New FTP server modules.
-- John Goerzen <jgoerzen at complete.org> Mon, 20 Dec 2004 13:47:04 -0600
diff --git a/libsrc/MissingH/Network/FTP/Client.hs b/libsrc/MissingH/Network/FTP/Client.hs
index 6724e8c..985f8f2 100644
--- a/libsrc/MissingH/Network/FTP/Client.hs
+++ b/libsrc/MissingH/Network/FTP/Client.hs
@@ -169,7 +169,7 @@ commands themselves./
This will be fairly rare. Just be aware of this.
This module logs messages under @MissingH.Network.FTP.Client@ for outgoing
-traffic and @MissingH.Network.FTP.Parser@ for incoming traffic, all with the
+traffic and @MissingH.Network.FTP.ParserClient@ for incoming traffic, all with the
'MissingH.Logging.DEBUG' priority, so by default, no log messages are seen.
The 'enableFTPDebugging' function will adjust the priorities of these
two handlers so debug messages are seen. Only control channel conversations
@@ -222,7 +222,7 @@ module MissingH.Network.FTP.Client(-- * Establishing\/Removing connections
retrlines, storlines
)
where
-import MissingH.Network.FTP.Parser
+import MissingH.Network.FTP.ParserClient
import Network.BSD
import Network.Socket
import qualified Network
@@ -254,7 +254,7 @@ easyConnectFTP h = do x <- connectFTP h 21
return (fst x)
{- | Enable logging of FTP messages through 'MissingH.Logging.Logger'.
-This sets the log levels of @MissingH.Network.FTP.Parser@ and
+This sets the log levels of @MissingH.Network.FTP.ParserClient@ and
@MissingH.Network.FTP.Client@ to DEBUG. By default, this means that
full protocol dumps will be sent to stderr.
@@ -263,7 +263,7 @@ The effect is global and persists until changed.
enableFTPDebugging :: IO ()
enableFTPDebugging =
do
- updateGlobalLogger "MissingH.Network.FTP.Parser" (setLevel DEBUG)
+ updateGlobalLogger "MissingH.Network.FTP.ParserClient" (setLevel DEBUG)
updateGlobalLogger "MissingH.Network.FTP.Client" (setLevel DEBUG)
{- | Connect to remote FTP server and read the welcome. -}
diff --git a/libsrc/MissingH/Network/FTP/Parser.hs b/libsrc/MissingH/Network/FTP/ParserClient.hs
similarity index 91%
copy from libsrc/MissingH/Network/FTP/Parser.hs
copy to libsrc/MissingH/Network/FTP/ParserClient.hs
index 62dcceb..7af42aa 100644
--- a/libsrc/MissingH/Network/FTP/Parser.hs
+++ b/libsrc/MissingH/Network/FTP/ParserClient.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Network.FTP.Parser
+ Module : MissingH.Network.FTP.ParserClient
Copyright : Copyright (C) 2004 John Goerzen
License : GNU GPL, version 2 or above
@@ -34,16 +34,16 @@ Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Network.FTP.Parser(parseReply, parseGoodReply,
- toPortString, fromPortString,
- debugParseGoodReply,
- respToSockAddr,
- FTPResult,
- -- * Utilities
- unexpectedresp, isxresp,
- forcexresp,
- forceioresp,
- parseDirName)
+module MissingH.Network.FTP.ParserClient(parseReply, parseGoodReply,
+ toPortString, fromPortString,
+ debugParseGoodReply,
+ respToSockAddr,
+ FTPResult,
+ -- * Utilities
+ unexpectedresp, isxresp,
+ forcexresp,
+ forceioresp,
+ parseDirName)
where
import Text.ParserCombinators.Parsec
@@ -62,7 +62,7 @@ type FTPResult = (Int, [String])
-- import Control.Exception(Exception(PatternMatchFail), throw)
logit :: String -> IO ()
-logit m = debugM "MissingH.Network.FTP.Parser" ("FTP received: " ++ m)
+logit m = debugM "MissingH.Network.FTP.ParserClient" ("FTP received: " ++ m)
----------------------------------------------------------------------
-- Utilities
diff --git a/libsrc/MissingH/Network/FTP/Parser.hs b/libsrc/MissingH/Network/FTP/ParserServer.hs
similarity index 95%
rename from libsrc/MissingH/Network/FTP/Parser.hs
rename to libsrc/MissingH/Network/FTP/ParserServer.hs
index 62dcceb..28c5135 100644
--- a/libsrc/MissingH/Network/FTP/Parser.hs
+++ b/libsrc/MissingH/Network/FTP/ParserServer.hs
@@ -1,4 +1,4 @@
-{- arch-tag: FTP protocol parser
+{- arch-tag: FTP protocol parser for servers
Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Network.FTP.Parser
+ Module : MissingH.Network.FTP.ParserServer
Copyright : Copyright (C) 2004 John Goerzen
License : GNU GPL, version 2 or above
@@ -27,14 +27,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Portability: systems with networking
This module provides a parser that is used internally by
-"MissingH.Network.FTP.Client". You almost certainly do not want to use
-this module directly. Use "MissingH.Network.FTP.Client" instead.
+"MissingH.Network.FTP.Server". You almost certainly do not want to use
+this module directly. Use "MissingH.Network.FTP.Server" instead.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Network.FTP.Parser(parseReply, parseGoodReply,
+module MissingH.Network.FTP.ParserServer(
+ parseReply, parseGoodReply,
toPortString, fromPortString,
debugParseGoodReply,
respToSockAddr,
@@ -45,7 +46,7 @@ module MissingH.Network.FTP.Parser(parseReply, parseGoodReply,
forceioresp,
parseDirName)
where
-
+import MissingH.Network.FTP.ParserClient
import Text.ParserCombinators.Parsec
import MissingH.Parsec
import MissingH.List
diff --git a/libsrc/MissingH/Network/FTP/Server.hs b/libsrc/MissingH/Network/FTP/Server.hs
index 94c191d..cde5244 100644
--- a/libsrc/MissingH/Network/FTP/Server.hs
+++ b/libsrc/MissingH/Network/FTP/Server.hs
@@ -62,4 +62,3 @@ sendReply h codei text =
writethis xs
in
writethis (map (rstrip) (lines text))
-
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list