[project @ 2002-05-09 13:16:29 by simonmar]

[haskell-directory.git] / System / Directory.hs

diff --git a/System/Directory.hs b/System/Directory.hs
index d487294..02c6841 100644 (file)
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1,15 +1,13 @@
 -----------------------------------------------------------------------------
--- 
+-- |
 -- Module      :  System.Directory
 -- Copyright   :  (c) The University of Glasgow 2001
--- License     :  BSD-style (see the file libraries/core/LICENSE)
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: Directory.hs,v 1.1 2002/02/05 17:32:27 simonmar Exp $
---
 -- System-independent interface to directory manipulation.
 --
 -----------------------------------------------------------------------------
@@ -470,13 +468,12 @@ getPermissions name = do
   exec  <- c_access s x_OK
   withFileStatus name $ \st -> do
   is_dir <- isDirectory st
-  is_reg <- isRegularFile st
   return (
     Permissions {
       readable   = read  == 0,
       writable   = write == 0,
       executable = not is_dir && exec == 0,
-      searchable = not is_reg && exec == 0
+      searchable = is_dir && exec == 0
     }
    )
 
@@ -516,11 +513,6 @@ isDirectory stat = do
   mode <- st_mode stat
   return (s_isdir mode)
 
-isRegularFile :: Ptr CStat -> IO Bool
-isRegularFile stat = do
-  mode <- st_mode stat
-  return (s_isreg mode)
-
 emptyCMode     :: CMode
 emptyCMode     = 0