From: krasimir <unknown>
Date: Wed, 18 Aug 2004 17:48:44 +0000 (+0000)
Subject: [project @ 2004-08-18 17:48:44 by krasimir]
X-Git-Tag: nhc98-1-18-release~269
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c1b1f7b8a8d06a92c309579f48d791eb83bb2855;p=ghc-base.git

[project @ 2004-08-18 17:48:44 by krasimir]
add getUserDocumentsDirectory function
---

diff --git a/System/Directory.hs b/System/Directory.hs
index 2080af0..9f8e38e 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -25,7 +25,8 @@ module System.Directory
     , getCurrentDirectory       -- :: IO FilePath
     , setCurrentDirectory       -- :: FilePath -> IO ()
     , getHomeDirectory
-    , getAppUserDataDirectory 
+    , getAppUserDataDirectory
+    , getUserDocumentsDirectory
 
     -- * Actions on files
     , removeFile		-- :: FilePath -> IO ()
@@ -65,6 +66,8 @@ getHomeDirectory = getEnv "HOME"
 getAppUserDataDirectory :: String -> IO FilePath
 getAppUserDataDirectory appName = do path <- getEnv "HOME"
                                      return (path++'/':'.':appName)
+getUserDocumentsDirectory :: IO FilePath
+getUserDocumentsDirectory= getEnv "HOME"
 #elif defined(__HUGS__)
 import Hugs.Directory
 #else
@@ -686,6 +689,37 @@ getAppUserDataDirectory appName = do
   return (path++'/':'.':appName)
 #endif
 
+{- | Returns the current user's document directory.
+
+The directory returned is expected to be writable by the current user,
+but note that it isn't generally considered good practice to store
+application-specific data here; use 'getAppUserDataDirectory'
+instead.
+
+On Unix, 'getUserDocumentsDirectory' returns the value of the @HOME@
+environment variable.  On Windows, the system is queried for a
+suitable path; a typical path might be 
+@C:/Documents and Settings/user/My Documents@.
+
+The operation may fail with:
+
+* 'UnsupportedOperation'
+The operating system has no notion of document directory.
+
+* 'isDoesNotExistError'
+The document directory for the current user does not exist, or
+cannot be found.
+-}
+getUserDocumentsDirectory :: IO FilePath
+getUserDocumentsDirectory = do
+#ifdef mingw32_TARGET_OS
+  allocaBytes long_path_size $ \pPath -> do
+     r <- c_SHGetFolderPath nullPtr csidl_PERSONAL nullPtr 0 pPath
+     peekCString pPath
+#else
+  getEnv "HOME"
+#endif
+
 #ifdef mingw32_TARGET_OS
 foreign import stdcall unsafe "SHGetFolderPath" 
             c_SHGetFolderPath :: Ptr () 
@@ -694,9 +728,10 @@ foreign import stdcall unsafe "SHGetFolderPath"
                               -> CInt 
                               -> CString 
                               -> IO CInt
-foreign import ccall unsafe "__hscore_CSIDL_PROFILE" csidl_PROFILE :: Int
-foreign import ccall unsafe "__hscore_CSIDL_APPDATA" csidl_APPDATA :: Int
-foreign import ccall unsafe "__hscore_CSIDL_WINDOWS" csidl_WINDOWS :: Int
+foreign import ccall unsafe "__hscore_CSIDL_PROFILE"  csidl_PROFILE  :: CInt
+foreign import ccall unsafe "__hscore_CSIDL_APPDATA"  csidl_APPDATA  :: CInt
+foreign import ccall unsafe "__hscore_CSIDL_WINDOWS"  csidl_WINDOWS  :: CInt
+foreign import ccall unsafe "__hscore_CSIDL_PERSONAL" csidl_PERSONAL :: CInt
 #endif
 
 {- |The operation 'doesDirectoryExist' returns 'True' if the argument file
diff --git a/include/HsBase.h b/include/HsBase.h
index 11d89ba..1fed966 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -714,6 +714,7 @@ INLINE int __hscore_fstat(int fd, struct stat *buf) {
 INLINE int __hscore_CSIDL_PROFILE() { return CSIDL_PROFILE; }
 INLINE int __hscore_CSIDL_APPDATA() { return CSIDL_APPDATA; }
 INLINE int __hscore_CSIDL_WINDOWS() { return CSIDL_WINDOWS; }
+INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; }
 #endif
 
 #endif /* __HSBASE_H__ */