Ticket #113: Haskeline-Unicode.dpatch

1 patch for repository http://code.haskell.org/haskeline:

Mon Apr 11 22:16:21 BST 2011  Max Bolingbroke <batterseapower@hotmail.com>
  * Use CAString functions to marshal locale names

New patches:

[Use CAString functions to marshal locale names
Max Bolingbroke <batterseapower@hotmail.com>**20110411211621
 Ignore-this: f99bf99f238b4510ae302255727ef521
] {
hunk ./System/Console/Haskeline/Backend/IConv.hsc 68
 foreign import ccall "setlocale" c_setlocale :: CInt -> CString -> IO CString
 
 setLocale :: Maybe String -> IO (Maybe String)
-setLocale oldLocale = (maybeWith withCString) oldLocale $ \loc_p -> do
-    c_setlocale (#const LC_CTYPE) loc_p >>= maybePeek peekCString
+setLocale oldLocale = (maybeWith withCAString) oldLocale $ \loc_p -> do
+    c_setlocale (#const LC_CTYPE) loc_p >>= maybePeek peekCAString
 
 -----------------
 -- Getting the encoding
hunk ./System/Console/Haskeline/Backend/IConv.hsc 80
 
 getCodeset :: IO String
 getCodeset = do
-    str <- nl_langinfo (#const CODESET) >>= peekCString
+    str <- nl_langinfo (#const CODESET) >>= peekCAString
     -- check for codesets which may be returned by Solaris, but not understood
     -- by GNU iconv.
     if str `elem` ["","646"]
hunk ./System/Console/Haskeline/Backend/IConv.hsc 98
     :: CString -> CString -> IO IConvTPtr
 
 iconvOpen :: String -> String -> IO IConvT
-iconvOpen destName srcName = withCString destName $ \dest ->
-                            withCString srcName $ \src -> do
+iconvOpen destName srcName = withCAString destName $ \dest ->
+                            withCAString srcName $ \src -> do
                                 res <- iconv_open dest src
                                 if res == nullPtr `plusPtr` (-1)
                                     then throwErrno $ "iconvOpen "
}

Context:

[TAG 0.6.4
Judah Jacobson <judah.jacobson@gmail.com>**20110317060752
 Ignore-this: 2df5eafa5f8c5571520de2d3d1a5dd5
] 
[Record getInputLineWithInitial in CHANGES.
Judah Jacobson <judah.jacobson@gmail.com>**20110317060407
 Ignore-this: 9755cf3570a68d58d26de487ef06e756
] 
[Add new function getInputLineWithInitial.
Judah Jacobson <judah.jacobson@gmail.com>**20110221232628
 Ignore-this: bfa1a14232fd4ca2438b9604c902fa43
 This function lets the user specify initial "default" text for the prompt.
 Adapted from a patch by Robert Massaioli.
] 
[Bump version to 0.6.4.0.
Judah Jacobson <judah.jacobson@gmail.com>**20110221230219
 Ignore-this: 891a0236739d7b96c57760fe4278493d
] 
[Add NondecreasingIndentation extension for GHC >= 7.1
Ian Lynagh <igloo@earth.li>**20110117192223
 Ignore-this: d76fd2b7014b2e412dfcb1af8bfa74c5
] 
[Fix issues with the "#81 Attempts" patch.
Judah Jacobson <judah.jacobson@gmail.com>**20101211071320
 Ignore-this: d29bc022667bf6c7fdc57db49046fb0
] 
[Attempt to fix #81 on Windows.
Judah Jacobson <judah.jacobson@gmail.com>**20101206215548
 Ignore-this: cba5d8c4f78f2b103f833776ab8044c8
] 
[Bump version to 0.6.3.3.
Judah Jacobson <judah.jacobson@gmail.com>**20101206215029
 Ignore-this: b313bccff23abbd9e56695b6527c675c
] 
[TAG 0.6.3.2
Judah Jacobson <judah.jacobson@gmail.com>**20101104171909
 Ignore-this: 20b210e0c28a8a522b47f14a1590dc2e
] 
Patch bundle hash:
476b2eb7d0fdbbc221b37ee3d1bafd4851b80e74