small changes + patch from Dekel

[lyx.git] / src / support / FileInfo.C

diff --git a/src/support/FileInfo.C b/src/support/FileInfo.C
index 2e2bf1c7f39aa8aa332cdd078161e7c072395545..aade9e243a76802474702015aafbfc15345d113b 100644 (file)
--- a/src/support/FileInfo.C
+++ b/src/support/FileInfo.C
@@ -5,12 +5,16 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <cerrno>
@@ -136,9 +140,9 @@ void FileInfo::init()
 void FileInfo::dostat(bool link)
 {
        if (link) {
-               status = lstat(fname.c_str(), &buf);
+               status = ::lstat(fname.c_str(), &buf);
        } else {
-               status = stat(fname.c_str(), &buf);
+               status = ::stat(fname.c_str(), &buf);
        }
        if (status) err = errno;
 }
@@ -167,6 +171,7 @@ FileInfo & FileInfo::newFile(int fildes)
 }
 
 
+// should not be in FileInfo
 char const * FileInfo::typeIndicator() const
 {
        if (S_ISDIR(buf.st_mode)) return ("/");
@@ -190,16 +195,8 @@ mode_t FileInfo::getMode() const
        return buf.st_mode;
 }
 
-long FileInfo::getBlockSize() const
-{
-#ifndef __EMX__
-       return buf.st_blksize; /* Preferred I/O block size */
-#else
-#warning May be fixed in 0.13 (SMiyata)
-       return 512; /* Assume HPFS */
-#endif
-}
 
+// should not be in FileInfo
 void FileInfo::modeString(char * szString) const
 {
        szString[0] = typeLetter();
@@ -211,6 +208,7 @@ void FileInfo::modeString(char * szString) const
 }
 
 
+// should not be in FileInfo
 char FileInfo::typeLetter() const
 {
 #ifdef S_ISBLK
@@ -238,7 +236,8 @@ char FileInfo::typeLetter() const
 }
 
 
-void FileInfo::flagRWX(unsigned short i, char * szString) const
+// should not be in FileInfo
+void FileInfo::flagRWX(mode_t i, char * szString) const
 {
        szString[0] = (i & S_IRUSR) ? 'r' : '-';
        szString[1] = (i & S_IWUSR) ? 'w' : '-';
@@ -246,6 +245,7 @@ void FileInfo::flagRWX(unsigned short i, char * szString) const
 }
 
 
+// should not be in FileInfo
 void FileInfo::setSticky(char * szString) const
 {
 #ifdef S_ISUID
@@ -281,7 +281,7 @@ time_t FileInfo::getAccessTime() const
 }
 
 
-time_t  FileInfo::getStatusChangeTime() const
+time_t FileInfo::getStatusChangeTime() const
 {
        return buf.st_ctime;
 }
@@ -372,7 +372,8 @@ bool FileInfo::isSocket() const
 }
 
 
-bool FileInfo::access(int p)
+// should not be in FileInfo
+bool FileInfo::access(int p) const
 {
        // if we don't have a filename we fail
        if (fname.empty()) return false;
@@ -385,3 +386,6 @@ bool FileInfo::access(int p)
                return false;
        }
 }
+
+
+