summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshikuniJujo <>2009-06-09 08:37:49 (GMT)
committerLuite Stegeman <luite@luite.com>2009-06-09 08:37:49 (GMT)
commit66f788ccf4f705393ba893e327c6761890bb5588 (patch)
tree1a93a4796892740e5d85a7d9c2d997c9a9f66566
parent6b7e28a9d29bbb3aec0473653c4b11a141df1797 (diff)
version 0.3.40.3.4
-rw-r--r--Network/CommandList.hs5
-rw-r--r--Network/Yjftp.hs2
-rw-r--r--yjftp.cabal7
3 files changed, 7 insertions, 7 deletions
diff --git a/Network/CommandList.hs b/Network/CommandList.hs
index f5045cd..9bd6cac 100644
--- a/Network/CommandList.hs
+++ b/Network/CommandList.hs
@@ -40,7 +40,7 @@ import System.IO.Error (isUserError)
import System.Posix.Temp (mkstemp)
import Data.Maybe (fromJust)
import Data.List (isPrefixOf)
-import Control.Exception (catchJust, ioErrors, ioError, bracketOnError)
+import Control.OldException (catchJust, ioErrors, ioError, bracketOnError)
import System.Console.Readline
@@ -144,8 +144,7 @@ moveFileFTP h [src, dst] = rename h src dst >> return True
moveFileFTP _ _ = error "moveFileFTP: args incorrect"
copyFileFTP :: Action
-copyFileFTP h [src, dst] = getbinary h src >>= flush >>= putbinary h dst . fst >> return True
- where flush s@(c,_) = putStr (take (length c - length c) "dummy") >> return s
+copyFileFTP h [src, dst] = getbinary h src >>= putbinary h dst . fst >> return True
copyFileFTP _ _ = error "Usage: cp src dist"
editBy :: (String -> IO String) -> Action
diff --git a/Network/Yjftp.hs b/Network/Yjftp.hs
index 851cd92..b2035dc 100644
--- a/Network/Yjftp.hs
+++ b/Network/Yjftp.hs
@@ -14,7 +14,7 @@ import System.Environment (getArgs)
import System.Posix.IO (stdOutput)
import System.Posix.Terminal(getTerminalAttributes, setTerminalAttributes, withoutMode,
TerminalState(Immediately), TerminalMode(EnableEcho))
-import Control.Exception (catch, Exception)
+import Control.OldException (catch, Exception)
import Control.Monad (when, unless)
import Control.Applicative ((<$>))
import Prelude hiding (catch)
diff --git a/yjftp.cabal b/yjftp.cabal
index ec66b7b..2f88c2d 100644
--- a/yjftp.cabal
+++ b/yjftp.cabal
@@ -1,5 +1,5 @@
Name: yjftp
-Version: 0.3.3
+Version: 0.3.4
License: GPL
License-file: LICENSE
Author: Yoshikuni Jujo
@@ -22,10 +22,11 @@ Description: Just CUI FTP client.
And you can put or get immediately by doing following.
.
> yjftp put filepath srvr.address/directorypath [user_name] [-p password]
+ .
> yjftp get srvr.address/filepath [user_name] [-p password]
Stability: experimental
Homepage: http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml
-Package-Url: http://homepage3.nifty.com/salamander/second/portage/distfiles/yjftp-0.3.2.tar.gz
+Package-Url: http://homepage3.nifty.com/salamander/second/portage/distfiles/yjftp-0.3.4.tar.gz
Cabal-Version: >= 1.2
Build-Type: Simple
Tested-With: GHC
@@ -35,7 +36,7 @@ Extra-Tmp-Files:
Library
GHC-Options: -Wall
- Build-Depends: base, unix, directory, process, ftphs, readline
+ Build-Depends: base >= 4 && <= 4.1.0.0, unix, directory, process, ftphs, readline
Exposed-Modules: Network.Yjftp
Other-Modules: Network.CommandList