[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:44:52 UTC 2010
The following commit has been merged in the master branch:
commit 5cd0b3b998a9c8844201f1a01ee9a3c427fd919b
Author: John Goerzen <jgoerzen at complete.org>
Date: Wed Oct 20 08:38:42 2004 +0100
Adjust WASH stuff for MissingH
Keywords:
(jgoerzen at complete.org--projects/missingh--head--1.0--patch-80)
diff --git a/ChangeLog b/ChangeLog
index 2424cfa..38d846b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,50 @@
# arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
#
+2004-10-20 02:38:42 GMT John Goerzen <jgoerzen at complete.org> patch-80
+
+ Summary:
+ Adjust WASH stuff for MissingH
+ Revision:
+ missingh--head--1.0--patch-80
+
+
+ removed files:
+ libsrc/MissingH/Wash/Utility/.arch-ids/Makefile.id
+ libsrc/MissingH/Wash/Utility/.arch-ids/SHA1.hs.id
+ libsrc/MissingH/Wash/Utility/.arch-ids/sha1lib.c.id
+ libsrc/MissingH/Wash/Utility/.arch-ids/sha1lib.h.id
+ libsrc/MissingH/Wash/Utility/Makefile
+ libsrc/MissingH/Wash/Utility/SHA1.hs
+ libsrc/MissingH/Wash/Utility/sha1lib.c
+ libsrc/MissingH/Wash/Utility/sha1lib.h
+
+ modified files:
+ ChangeLog libsrc/MissingH/Wash/Mail/Email.hs
+ libsrc/MissingH/Wash/Mail/EmailConfig.hs
+ libsrc/MissingH/Wash/Mail/HeaderField.hs
+ libsrc/MissingH/Wash/Mail/MIME.hs
+ libsrc/MissingH/Wash/Mail/MailParser.hs
+ libsrc/MissingH/Wash/Mail/Message.hs
+ libsrc/MissingH/Wash/Utility/Auxiliary.hs
+ libsrc/MissingH/Wash/Utility/Base32.hs
+ libsrc/MissingH/Wash/Utility/Base64.hs
+ libsrc/MissingH/Wash/Utility/FileNames.hs
+ libsrc/MissingH/Wash/Utility/Hex.hs
+ libsrc/MissingH/Wash/Utility/ISO8601.hs
+ libsrc/MissingH/Wash/Utility/IntToString.hs
+ libsrc/MissingH/Wash/Utility/JavaScript.hs
+ libsrc/MissingH/Wash/Utility/Locking.hs
+ libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
+ libsrc/MissingH/Wash/Utility/RFC2047.hs
+ libsrc/MissingH/Wash/Utility/RFC2279.hs
+ libsrc/MissingH/Wash/Utility/RFC2397.hs
+ libsrc/MissingH/Wash/Utility/Shell.hs
+ libsrc/MissingH/Wash/Utility/SimpleParser.hs
+ libsrc/MissingH/Wash/Utility/URLCoding.hs
+ libsrc/MissingH/Wash/Utility/Unique.hs
+
+
2004-10-20 02:21:37 GMT John Goerzen <jgoerzen at complete.org> patch-79
Summary:
diff --git a/libsrc/MissingH/Wash/Mail/Email.hs b/libsrc/MissingH/Wash/Mail/Email.hs
index 4cde469..7f697ac 100644
--- a/libsrc/MissingH/Wash/Mail/Email.hs
+++ b/libsrc/MissingH/Wash/Mail/Email.hs
@@ -1,20 +1,21 @@
-- © 2001, 2002 Peter Thiemann
-module Email (
+module MissingH.Wash.Mail.Email (
sendmail, inventMessageId, exitcodeToSYSEXIT, SYSEXIT(..),
- module MIME, module HeaderField) where
+ module MissingH.Wash.Mail.MIME,
+ module MissingH.Wash.Mail.HeaderField) where
-- from standard library
import IO
import System
-- from utility
-import Auxiliary
-import Unique
+import MissingH.Wash.Utility.Auxiliary
+import MissingH.Wash.Utility.Unique
-- from package
-import EmailConfig
-import HeaderField
-import MIME
+import MissingH.Wash.Mail.EmailConfig
+import MissingH.Wash.Mail.HeaderField
+import MissingH.Wash.Mail.MIME
-- |from sysexit.h
data SYSEXIT =
diff --git a/libsrc/MissingH/Wash/Mail/EmailConfig.hs b/libsrc/MissingH/Wash/Mail/EmailConfig.hs
index da7e3ec..08cbb11 100644
--- a/libsrc/MissingH/Wash/Mail/EmailConfig.hs
+++ b/libsrc/MissingH/Wash/Mail/EmailConfig.hs
@@ -1,4 +1,4 @@
-module EmailConfig where
+module MissingH.Wash.Mail.EmailConfig where
tmpDir, varDir, emailTmpDir, sendmailProgram :: String
diff --git a/libsrc/MissingH/Wash/Mail/HeaderField.hs b/libsrc/MissingH/Wash/Mail/HeaderField.hs
index 12ffb60..5666869 100644
--- a/libsrc/MissingH/Wash/Mail/HeaderField.hs
+++ b/libsrc/MissingH/Wash/Mail/HeaderField.hs
@@ -1,6 +1,6 @@
-module HeaderField where
+module MissingH.Wash.Mail.HeaderField where
-import RFC2047
+import MissingH.Wash.Utility.RFC2047
--
newtype Header = Header (String, String)
diff --git a/libsrc/MissingH/Wash/Mail/MIME.hs b/libsrc/MissingH/Wash/Mail/MIME.hs
index 6d847cd..8554de5 100644
--- a/libsrc/MissingH/Wash/Mail/MIME.hs
+++ b/libsrc/MissingH/Wash/Mail/MIME.hs
@@ -1,5 +1,5 @@
-- © 2001, 2002 Peter Thiemann
-module MIME where
+module MissingH.Wash.Mail.MIME where
-- RFC 2045
-- RFC 2046
@@ -7,10 +7,11 @@ import IO
import Random
import Char
-import qualified Base64
-import qualified QuotedPrintable
-import HeaderField
-import qualified RFC2279 -- UTF-8
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import MissingH.Wash.Mail.HeaderField
+import qualified MissingH.Wash.Utility.RFC2279 as RFC2279
+-- UTF-8
-- --------------------------------------------------------------------
diff --git a/libsrc/MissingH/Wash/Mail/MailParser.hs b/libsrc/MissingH/Wash/Mail/MailParser.hs
index a264b36..2f378d0 100644
--- a/libsrc/MissingH/Wash/Mail/MailParser.hs
+++ b/libsrc/MissingH/Wash/Mail/MailParser.hs
@@ -1,4 +1,4 @@
-module MailParser where
+module MissingH.Wash.Mail.MailParser where
-- see RFC 2822
-- TODO: check against their definition of token
@@ -6,13 +6,14 @@ import Char
import List
import Maybe
--
-import Parsec
+import Text.ParserCombinators.Parsec
--
-import qualified Base64
-import qualified QuotedPrintable
-import RFC2047 (p_token)
-import Message
-import HeaderField
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import qualified MissingH.Wash.Utility.RFC2047 as RFC2047
+import MissingH.Wash.Utility.RFC2047 (p_token)
+import MissingH.Wash.Mail.Message
+import MissingH.Wash.Mail.HeaderField
parseMessageFromFile fname =
parseFromFile message fname
diff --git a/libsrc/MissingH/Wash/Mail/Message.hs b/libsrc/MissingH/Wash/Mail/Message.hs
index 08bc371..ee69abd 100644
--- a/libsrc/MissingH/Wash/Mail/Message.hs
+++ b/libsrc/MissingH/Wash/Mail/Message.hs
@@ -1,6 +1,6 @@
-module Message where
+module MissingH.Wash.Mail.Message where
-import HeaderField
+import MissingH.Wash.Mail.HeaderField
data Message =
Singlepart
diff --git a/libsrc/MissingH/Wash/Utility/Auxiliary.hs b/libsrc/MissingH/Wash/Utility/Auxiliary.hs
index d6d85c7..15cab7a 100644
--- a/libsrc/MissingH/Wash/Utility/Auxiliary.hs
+++ b/libsrc/MissingH/Wash/Utility/Auxiliary.hs
@@ -1,10 +1,10 @@
-module Auxiliary where
+module MissingH.Wash.Utility.Auxiliary where
import IO
import System
import Directory
-import FileNames
-import qualified Shell
+import MissingH.Wash.Utility.FileNames
+import qualified MissingH.Wash.Utility.Shell as Shell
protectedGetEnv :: String -> String -> IO String
protectedGetEnv var deflt =
diff --git a/libsrc/MissingH/Wash/Utility/Base32.hs b/libsrc/MissingH/Wash/Utility/Base32.hs
index 98898ee..dea78bf 100644
--- a/libsrc/MissingH/Wash/Utility/Base32.hs
+++ b/libsrc/MissingH/Wash/Utility/Base32.hs
@@ -2,7 +2,7 @@
-- http://www.ietf.org/rfc/rfc3548.txt
-- Author: Niklas Deutschmann
-module Base32 (encode, decode) where
+module MissingH.Wash.Utility.Base32 (encode, decode) where
import Bits
import Char
diff --git a/libsrc/MissingH/Wash/Utility/Base64.hs b/libsrc/MissingH/Wash/Utility/Base64.hs
index c55a4f1..afe6326 100644
--- a/libsrc/MissingH/Wash/Utility/Base64.hs
+++ b/libsrc/MissingH/Wash/Utility/Base64.hs
@@ -1,6 +1,6 @@
-- © 2002 Peter Thiemann
-- |Implements RFC 2045 MIME coding.
-module Base64
+module MissingH.Wash.Utility.Base64
(encode, encode', decode, decode'
,alphabet_list
)
diff --git a/libsrc/MissingH/Wash/Utility/FileNames.hs b/libsrc/MissingH/Wash/Utility/FileNames.hs
index ea99240..7a161db 100644
--- a/libsrc/MissingH/Wash/Utility/FileNames.hs
+++ b/libsrc/MissingH/Wash/Utility/FileNames.hs
@@ -1,4 +1,4 @@
-module FileNames where
+module MissingH.Wash.Utility.FileNames where
longestSuffix :: (a -> Bool) -> [a] -> [a]
longestSuffix p xs =
diff --git a/libsrc/MissingH/Wash/Utility/Hex.hs b/libsrc/MissingH/Wash/Utility/Hex.hs
index d1f1609..4da2185 100644
--- a/libsrc/MissingH/Wash/Utility/Hex.hs
+++ b/libsrc/MissingH/Wash/Utility/Hex.hs
@@ -1,5 +1,5 @@
-- © 2001, 2003 Peter Thiemann
-module Hex where
+module MissingH.Wash.Utility.Hex where
import Array
import Char
diff --git a/libsrc/MissingH/Wash/Utility/ISO8601.hs b/libsrc/MissingH/Wash/Utility/ISO8601.hs
index 8f4f2c7..0df774e 100644
--- a/libsrc/MissingH/Wash/Utility/ISO8601.hs
+++ b/libsrc/MissingH/Wash/Utility/ISO8601.hs
@@ -1,14 +1,14 @@
-- © 2002 Peter Thiemann
-module ISO8601 where
+module MissingH.Wash.Utility.ISO8601 where
import Char
import Monad
import Time
-import IOExts
+import System.IO.Unsafe
-import IntToString
-import SimpleParser
+import MissingH.Wash.Utility.IntToString
+import MissingH.Wash.Utility.SimpleParser
secondsToString seconds =
intToString 20 seconds
diff --git a/libsrc/MissingH/Wash/Utility/IntToString.hs b/libsrc/MissingH/Wash/Utility/IntToString.hs
index 93f8a2a..ea0f497 100644
--- a/libsrc/MissingH/Wash/Utility/IntToString.hs
+++ b/libsrc/MissingH/Wash/Utility/IntToString.hs
@@ -1,5 +1,5 @@
-- © 2002 Peter Thiemann
-module IntToString where
+module MissingH.Wash.Utility.IntToString where
import Char
diff --git a/libsrc/MissingH/Wash/Utility/JavaScript.hs b/libsrc/MissingH/Wash/Utility/JavaScript.hs
index 26e54b8..ae9493e 100644
--- a/libsrc/MissingH/Wash/Utility/JavaScript.hs
+++ b/libsrc/MissingH/Wash/Utility/JavaScript.hs
@@ -1,9 +1,9 @@
-- © 2003 Peter Thiemann
-module JavaScript where
+module MissingH.Wash.Utility.JavaScript where
import Char
-import Hex
+import MissingH.Wash.Utility.Hex
jsShow :: String -> String
jsShow xs = '\'' : g xs
diff --git a/libsrc/MissingH/Wash/Utility/Locking.hs b/libsrc/MissingH/Wash/Utility/Locking.hs
index 569cfa8..46c7bf7 100644
--- a/libsrc/MissingH/Wash/Utility/Locking.hs
+++ b/libsrc/MissingH/Wash/Utility/Locking.hs
@@ -1,6 +1,6 @@
-module Locking (obtainLock, releaseLock) where
+module MissingH.Wash.Utility.Locking (obtainLock, releaseLock) where
-import Auxiliary
+import MissingH.Wash.Utility.Auxiliary
import Directory
import IO
import System
diff --git a/libsrc/MissingH/Wash/Utility/Makefile b/libsrc/MissingH/Wash/Utility/Makefile
deleted file mode 100644
index 89abd4f..0000000
--- a/libsrc/MissingH/Wash/Utility/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Makefile for WASH/Utility (Haskell98)
-# copyright 2001-2003 by Peter Thiemann
-#
-
-PACKAGE=Utility
-VERSION=0.3.11
-
-include $(TOP)/mk/config.mk
-include $(TOP)/mk/common.mk
-
-FILES= Makefile LICENSE Utility.pkg $(HS_SOURCES) $(C_SOURCES) $(H_SOURCES)
-HS_SOURCES=\
- Auxiliary.hs \
- Base32.hs \
- Base64.hs \
- FileNames.hs \
- Hex.hs \
- ISO8601.hs \
- IntToString.hs \
- JavaScript.hs \
- Locking.hs \
- QuotedPrintable.hs \
- RFC2047.hs \
- RFC2279.hs \
- RFC2397.hs \
- SHA1.hs \
- SimpleParser.hs \
- Shell.hs \
- URLCoding.hs \
- Unique.hs \
-
-C_SOURCES= sha1lib.c
-H_SOURCES= sha1lib.h
-
-FULLNAME=$(PACKAGE)-$(VERSION)
-BINDISTNAME=$(PACKAGE)-bin-$(VERSION).tgz
-DISTNAME=$(FULLNAME).tgz
-# where the WASH homepage resides
-WWWDIR=$(HOME)/public/www/haskell/WASH
-TMPDIR=/tmp
-
-######################################################################
-# goals
-
-all: libUtility.a
-
-libUtility.a: libUtility.a($(HS_SOURCES:.hs=.o) $(C_SOURCES:.c=.o))
- $(RANLIB) $@
-
-dist: documentation
- $(RM) -rf $(TMPDIR)/$(FULLNAME)
- $(MKDIR) -p $(TMPDIR)/$(FULLNAME)/$(DOCSUBDIR)
- $(CP) $(FILES) $(TMPDIR)/$(FULLNAME)
- $(CP) -rp $(DOCSUBDIR) $(TMPDIR)/$(FULLNAME)
- $(TAR) cfCvz $(DISTNAME) $(TMPDIR) $(FULLNAME)
-
-install-distribution: dist
- $(INSTALL) $(DISTNAME) $(WWWDIR)
-
-install: libUtility.a
- $(INSTALL) -d $(PACKAGELIBDIR)
- $(INSTALL) -d $(PACKAGEIMPORTDIR)
- $(INSTALL) -c -m 644 $(HS_SOURCES:.hs=.hi) $(PACKAGEIMPORTDIR)
- $(INSTALL) -c -m 644 libUtility.a $(PACKAGELIBDIR)
- $(RANLIB) $(PACKAGELIBDIR)/libUtility.a
-ifeq ($(ENABLE_REG_PACKAGE),yes)
- $(GENPKG) $(PACKAGE) --import_dirs $(PACKAGEIMPORTDIR) --library_dirs $(PACKAGELIBDIR) --hs_libraries $(PACKAGE) --package_deps text | $(GHCPKG) $(GHCPKGFLAGS) --update-package --auto-ghci-libs
-endif
-
-######################################################################
-# special dependencies
-
-sha1lib.o: sha1lib.h
-SHA1.o: sha1lib.h
-
-######################################################################
-# generic stuff
-
-HC_SPEC_FLAGS= -package-name $(PACKAGE)
-HCINCLUDES= -package text
-HCLOADFLAGS=
-
-OPT= -O2 -ffi
-
-HCFLAGS= $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES) $(HCEXTRAFLAGS)
-
-HS_FILES= $(HS_SOURCES)
-
-DOCSUBDIR= doc
-
-documentation: $(DOCSUBDIR)
-
-$(DOCSUBDIR): $(HS_SOURCES)
- $(RM) -rf $(DOCSUBDIR)
- $(MKDIR) $(DOCSUBDIR)
- $(HADDOCK) -o $(DOCSUBDIR) -h $(HS_SOURCES)
-
-clean:
- $(RM) -f *.a *.o *.hi
-
-veryclean:: clean
-
-depend::
- $(HC) -M $(HCFLAGS) $(HS_FILES)
-
-# DO NOT DELETE: Beginning of Haskell dependencies
-Auxiliary.o : Auxiliary.hs
-Auxiliary.o : ./Shell.hi
-Auxiliary.o : ./FileNames.hi
-Base32.o : Base32.hs
-Base64.o : Base64.hs
-FileNames.o : FileNames.hs
-Hex.o : Hex.hs
-ISO8601.o : ISO8601.hs
-ISO8601.o : ./SimpleParser.hi
-ISO8601.o : ./IntToString.hi
-IntToString.o : IntToString.hs
-JavaScript.o : JavaScript.hs
-JavaScript.o : Hex.hi
-Locking.o : Locking.hs
-Locking.o : Auxiliary.hi
-QuotedPrintable.o : QuotedPrintable.hs
-QuotedPrintable.o : Hex.hi
-RFC2047.o : RFC2047.hs
-RFC2047.o : Hex.hi
-RFC2047.o : QuotedPrintable.hi
-RFC2047.o : Base64.hi
-RFC2279.o : RFC2279.hs
-RFC2397.o : RFC2397.hs
-RFC2397.o : Base64.hi
-RFC2397.o : ./URLCoding.hi
-SHA1.o : SHA1.hs
-SimpleParser.o : SimpleParser.hs
-Shell.o : Shell.hs
-URLCoding.o : URLCoding.hs
-URLCoding.o : Hex.hi
-Unique.o : Unique.hs
-Unique.o : Locking.hi
-Unique.o : Auxiliary.hi
-# DO NOT DELETE: End of Haskell dependencies
diff --git a/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs b/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
index 9a66f66..8d70333 100644
--- a/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
+++ b/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
@@ -1,10 +1,10 @@
-module QuotedPrintable
+module MissingH.Wash.Utility.QuotedPrintable
(encode, encode', decode
-- deprecated: encode_quoted, encode_quoted', decode_quoted
) where
import Char
-import Hex
+import MissingH.Wash.Utility.Hex
encode, encode', decode :: String -> String
encode = encode_quoted
diff --git a/libsrc/MissingH/Wash/Utility/RFC2047.hs b/libsrc/MissingH/Wash/Utility/RFC2047.hs
index 1188514..a8548b6 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2047.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2047.hs
@@ -1,12 +1,12 @@
-module RFC2047 where
+module MissingH.Wash.Utility.RFC2047 where
-- decoding of header fields
import Char
import List
-import qualified Base64
-import qualified QuotedPrintable
-import Hex
-import Parsec
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import MissingH.Wash.Utility.Hex
+import Text.ParserCombinators.Parsec
lineString =
do initial <- many (noneOf "\n\r=")
diff --git a/libsrc/MissingH/Wash/Utility/RFC2279.hs b/libsrc/MissingH/Wash/Utility/RFC2279.hs
index 1377ee9..d0a7470 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2279.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2279.hs
@@ -10,7 +10,7 @@
0020 0000-03FF FFFF 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
0400 0000-7FFF FFFF 1111110x 10xxxxxx ... 10xxxxxx
-}
-module RFC2279 (encode, decode) where
+module MissingH.Wash.Utility.RFC2279 (encode, decode) where
import Char
diff --git a/libsrc/MissingH/Wash/Utility/RFC2397.hs b/libsrc/MissingH/Wash/Utility/RFC2397.hs
index 0dbd15b..9b881c1 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2397.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2397.hs
@@ -1,7 +1,10 @@
-module RFC2397 where
+module MissingH.Wash.Utility.RFC2397 where
-import URLCoding
-import Base64
+import MissingH.Wash.Utility.URLCoding
+import MissingH.Wash.Utility.Base64
+
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.URLCoding as URLCoding
data ENC = BASE64 | URL
deriving Eq
diff --git a/libsrc/MissingH/Wash/Utility/SHA1.hs b/libsrc/MissingH/Wash/Utility/SHA1.hs
deleted file mode 100644
index 3dd1ccb..0000000
--- a/libsrc/MissingH/Wash/Utility/SHA1.hs
+++ /dev/null
@@ -1,50 +0,0 @@
--- SHA1 hash function.
-
--- SHA1:
--- http://sea-to-sky.net/~sreid/sha1.c
-
-module SHA1 where
-
-import Int
-import Ptr
-import MarshalAlloc
-import CString
-import CTypes
-import IOExts
-import Storable (pokeByteOff)
-import Bits
-import Char
-
-type SHA1_CTX = ()
-type SHA1_DIGEST = Ptr CChar
-
-foreign import ccall "sha1lib.h SHA1Init"
- sha1_init :: Ptr SHA1_CTX -> IO ()
-foreign import ccall "sha1lib.h SHA1Update"
- sha1_update :: Ptr SHA1_CTX -> Ptr CChar -> Int32 -> IO ()
-foreign import ccall "sha1lib.h SHA1Final"
- sha1_final :: SHA1_DIGEST -> Ptr SHA1_CTX -> IO ()
-
-sha1 :: String -> String
-sha1 str =
- unsafePerformIO $
- do sha1_context <- mallocBytes (64 + 5*4 + 2*4)
- sha1_digest <- mallocBytes 20
- sha1_init sha1_context
- let loop s =
- -- Process 16KB block in every round.
- case splitAt 16384 s of
- (xs, ys) ->
- do cs <- newCString xs
- sha1_update sha1_context cs (fromIntegral (length xs))
- case ys of
- [] -> return ()
- _ -> loop ys
- loop str
- sha1_final sha1_digest sha1_context
- peekCStringLen (sha1_digest, 20)
-
-
-
-
-
diff --git a/libsrc/MissingH/Wash/Utility/Shell.hs b/libsrc/MissingH/Wash/Utility/Shell.hs
index fae193a..b2e8c82 100644
--- a/libsrc/MissingH/Wash/Utility/Shell.hs
+++ b/libsrc/MissingH/Wash/Utility/Shell.hs
@@ -1,6 +1,6 @@
-- © 2002 Peter Thiemann
-- |Defines functions for shell quotation.
-module Shell where
+module MissingH.Wash.Utility.Shell where
import Char
diff --git a/libsrc/MissingH/Wash/Utility/SimpleParser.hs b/libsrc/MissingH/Wash/Utility/SimpleParser.hs
index 43890dc..7e78126 100644
--- a/libsrc/MissingH/Wash/Utility/SimpleParser.hs
+++ b/libsrc/MissingH/Wash/Utility/SimpleParser.hs
@@ -1,5 +1,5 @@
-- © 2002 Peter Thiemann
-module SimpleParser where
+module MissingH.Wash.Utility.SimpleParser where
import Char
diff --git a/libsrc/MissingH/Wash/Utility/URLCoding.hs b/libsrc/MissingH/Wash/Utility/URLCoding.hs
index 2b3d8d6..562b2f6 100644
--- a/libsrc/MissingH/Wash/Utility/URLCoding.hs
+++ b/libsrc/MissingH/Wash/Utility/URLCoding.hs
@@ -1,9 +1,9 @@
-- © 2001, 2002 Peter Thiemann
-- |Implements coding of non-alphanumeric characters in URLs and CGI-requests.
-module URLCoding (encode, decode) where
+module MissingH.Wash.Utility.URLCoding (encode, decode) where
import Char
-import Hex
+import MissingH.Wash.Utility.Hex
encode, decode :: String -> String
encode = urlEncode
diff --git a/libsrc/MissingH/Wash/Utility/Unique.hs b/libsrc/MissingH/Wash/Utility/Unique.hs
index fefd85c..dfac033 100644
--- a/libsrc/MissingH/Wash/Utility/Unique.hs
+++ b/libsrc/MissingH/Wash/Utility/Unique.hs
@@ -1,13 +1,13 @@
-- © 2001 Peter Thiemann
-module Unique (inventStdKey, inventKey, inventFilePath) where
+module MissingH.Wash.Utility.Unique (inventStdKey, inventKey, inventFilePath) where
import Random
import IO
import Directory
-import Auxiliary
+import MissingH.Wash.Utility.Auxiliary
import List
import Monad
-import Locking
+import MissingH.Wash.Utility.Locking
registryDir = "/tmp/Unique/"
diff --git a/libsrc/MissingH/Wash/Utility/sha1lib.c b/libsrc/MissingH/Wash/Utility/sha1lib.c
deleted file mode 100644
index 6701777..0000000
--- a/libsrc/MissingH/Wash/Utility/sha1lib.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-SHA-1 in C
-By Steve Reid <sreid at sea-to-sky.net>
-100% Public Domain
-
------------------
-Modified 7/98
-By James H. Brown <jbrown at burgoyne.com>
-Still 100% Public Domain
-
------------------
-Library version 8/03
-by Niklas Deutschmann <nickel.de at gmx.de>
-Still 100% Public domain!
-
-Corrected a problem which generated improper hash values on 16 bit machines
-Routine SHA1Update changed from
- void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len)
-to
- void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned long len)
-
-The 'len' parameter was declared an int which works fine on 32 bit machines.
-However, on 16 bit machines an int is too small for the shifts being done
-against it. This caused the hash function to generate incorrect values if len was
-greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
-
-Since the file IO in main() reads 16K at a time, any file 8K or larger would
-be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
-"a"s).
-
-I also changed the declaration of variables i & j in SHA1Update to
-unsigned long from unsigned int for the same reason.
-
-These changes should make no difference to any 32 bit implementations since
-an int and a long are the same size in those environments.
-
---
-I also corrected a few compiler warnings generated by Borland C.
-1. Added #include <process.h> for exit() prototype
-2. Removed unused variable 'j' in SHA1Final
-3. Changed exit(0) to return(0) at end of main.
-
-ALL changes I made can be located by searching for comments containing 'JHB'
------------------
-Modified 8/98
-By Steve Reid <sreid at sea-to-sky.net>
-Still 100% public domain
-
-1- Removed #include <process.h> and used return() instead of exit()
-2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
-3- Changed email address from steve at edmweb.com to sreid at sea-to-sky.net
-
------------------
-Modified 4/01
-By Saul Kravitz <Saul.Kravitz at celera.com>
-Still 100% PD
-Modified to run on Compaq Alpha hardware.
-
-
-*/
-
-/*
-Test Vectors (from FIPS PUB 180-1)
-"abc"
- A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
- 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-/* #define SHA1HANDSOFF */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "sha1lib.h"
-
-/* #include <process.h> */ /* prototype for exit() - JHB */
-/* Using return() instead of exit() - SWR */
-
-void SHA1Transform(uint32 state[5], unsigned char buffer[64]);
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#ifdef LITTLE_ENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
- |(rol(block->l[i],8)&0x00FF00FF))
-#else
-#define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-#ifdef VERBOSE /* SAK */
-void SHAPrintContext(SHA1_CTX *context, char *msg){
- printf("%s (%d,%d) %x %x %x %x %x\n",
- msg,
- context->count[0], context->count[1],
- context->state[0],
- context->state[1],
- context->state[2],
- context->state[3],
- context->state[4]);
-}
-#endif
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-void SHA1Transform(uint32 state[5], unsigned char buffer[64])
-{
- uint32 a, b, c, d, e;
- typedef union {
- unsigned char c[64];
- uint32 l[16];
- } CHAR64LONG16;
- CHAR64LONG16* block;
-#ifdef SHA1HANDSOFF
- static unsigned char workspace[64];
- block = (CHAR64LONG16*)workspace;
- memcpy(block, buffer, 64);
-#else
- block = (CHAR64LONG16*)buffer;
-#endif
- /* Copy context->state[] to working vars */
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
- /* 4 rounds of 20 operations each. Loop unrolled. */
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
- /* Add the working vars back into context.state[] */
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
- /* Wipe variables */
- a = b = c = d = e = 0;
-}
-
-
-/* SHA1Init - Initialize new context */
-
-void SHA1Init(SHA1_CTX* context)
-{
- /* SHA1 initialization constants */
- context->state[0] = 0x67452301;
- context->state[1] = 0xEFCDAB89;
- context->state[2] = 0x98BADCFE;
- context->state[3] = 0x10325476;
- context->state[4] = 0xC3D2E1F0;
- context->count[0] = context->count[1] = 0;
-}
-
-
-/* Run your data through this. */
-
-void SHA1Update(SHA1_CTX* context, unsigned char* data, uint32 len) /* JHB */
-{
- uint32 i, j; /* JHB */
-
-#ifdef VERBOSE
- SHAPrintContext(context, "before");
-#endif
- j = (context->count[0] >> 3) & 63;
- if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
- context->count[1] += (len >> 29);
- if ((j + len) > 63) {
- memcpy(&context->buffer[j], data, (i = 64-j));
- SHA1Transform(context->state, context->buffer);
- for ( ; i + 63 < len; i += 64) {
- SHA1Transform(context->state, &data[i]);
- }
- j = 0;
- }
- else i = 0;
- memcpy(&context->buffer[j], &data[i], len - i);
-#ifdef VERBOSE
- SHAPrintContext(context, "after ");
-#endif
-}
-
-
-/* Add padding and return the message digest. */
-
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context) {
- uint32 i; /* JHB */
- unsigned char finalcount[8];
-
- for (i = 0; i < 8; i++) {
- finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
- }
- SHA1Update(context, (unsigned char *)"\200", 1);
- while ((context->count[0] & 504) != 448) {
- SHA1Update(context, (unsigned char *)"\0", 1);
- }
- SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform()
- */
- for (i = 0; i < 20; i++) {
- digest[i] = (unsigned char)
- ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
- }
- /* Wipe variables */
- i = 0; /* JHB */
- memset(context->buffer, 0, 64);
- memset(context->state, 0, 20);
- memset(context->count, 0, 8);
- memset(finalcount, 0, 8); /* SWR */
-#ifdef SHA1HANDSOFF /* make SHA1Transform overwrite it's own static vars */
- SHA1Transform(context->state, context->buffer);
-#endif
-}
-
-/*************************************************************/
-
-
-
diff --git a/libsrc/MissingH/Wash/Utility/sha1lib.h b/libsrc/MissingH/Wash/Utility/sha1lib.h
deleted file mode 100644
index 33ac4c5..0000000
--- a/libsrc/MissingH/Wash/Utility/sha1lib.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _SHA1LIB_H_
-#define _SHA1LIB_H_
-
-#ifndef i386 /* For ALPHA (SAK) */
-#define LITTLE_ENDIAN
-typedef long int int64;
-typedef unsigned long int uint64;
-typedef int int32;
-typedef unsigned int uint32;
-#else /*i386*/
-#define LITTLE_ENDIAN
-typedef long long int int64;
-typedef unsigned long long int uint64;
-typedef long int int32;
-typedef unsigned long int uint32;
-#endif /*i386*/
-
-typedef struct {
- uint32 state[5];
- uint32 count[2];
- unsigned char buffer[64];
-} SHA1_CTX;
-
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, unsigned char* data, uint32 len); /* JHB */
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
-
-#endif
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list