4 files changed, 103 insertions, 47 deletions

diff --git a/src/FbTk/Directory.cc b/src/FbTk/FileUtil.cc
index 0535dc0..b70eff3 100644
--- a/src/FbTk/Directory.cc
+++ b/src/FbTk/FileUtil.cc
@@ -1,5 +1,5 @@
-// Directory.cc
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// FileUtil.cc
+// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -21,13 +21,70 @@
 
 // $Id$
 
-#include "Directory.hh"
+#include "FileUtil.hh"
 
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <iostream>
+#include <fstream>
+
+using std::ifstream;
+using std::ofstream;
+using std::cerr;
+using std::endl;
+
 namespace FbTk {
 
+time_t FileUtil::getLastStatusChangeTimestamp(const char* filename) {
+    struct stat buf;
+    if (filename && !stat(filename, &buf)) {
+        return buf.st_ctime;
+    } else 
+        return (time_t)-1;
+}
+
+bool FileUtil::isDirectory(const char* filename) {
+    struct stat buf;
+    if (!filename || stat(filename, &buf))
+        return false;
+
+    return S_ISDIR(buf.st_mode);
+}
+
+bool FileUtil::isRegularFile(const char* filename) {
+    struct stat buf;
+    if (!filename || stat(filename, &buf))
+        return false;
+
+    return S_ISREG(buf.st_mode);
+}
+
+bool FileUtil::isExecutable(const char* filename) {
+    struct stat buf;
+    if (!filename || !stat(filename, &buf))
+        return false;
+
+    return buf.st_mode & S_IXUSR || 
+           buf.st_mode & S_IXGRP ||
+           buf.st_mode & S_IXOTH;
+}
+
+bool FileUtil::copyFile(const char* from, const char* to) {
+    ifstream from_file(from);
+    ofstream to_file(to);
+
+    if (!to_file.good())
+        cerr << "Can't write file '"<<to<<"'."<<endl;
+    else if (from_file.good()) {
+        to_file<<from_file.rdbuf();
+        return true;
+    } else
+        cerr << "Can't copy from '"<<from<<"' to '"<<to<<"'."<<endl;
+    
+    return false;
+}
+
 Directory::Directory(const char *dir):m_dir(0),
 m_num_entries(0) {
     if (dir != 0)
@@ -89,30 +146,5 @@ bool Directory::open(const char *dir) {
     return true;
 }
 
-bool Directory::isDirectory(const std::string &filename) {
-    struct stat statbuf;
-    if (stat(filename.c_str(), &statbuf) != 0)
-        return false;
-
-    return S_ISDIR(statbuf.st_mode);
-}
-
-bool Directory::isRegularFile(const std::string &filename) {
-    struct stat statbuf;
-    if (stat(filename.c_str(), &statbuf) != 0)
-        return false;
-
-    return S_ISREG(statbuf.st_mode);
-}
-
-bool Directory::isExecutable(const std::string &filename) {
-    struct stat statbuf;
-    if (stat(filename.c_str(), &statbuf) != 0)
-        return false;
-
-    return statbuf.st_mode & S_IXUSR || 
-           statbuf.st_mode & S_IXGRP ||
-           statbuf.st_mode & S_IXOTH;
-}
 
 }; // end namespace FbTk
diff --git a/src/FbTk/Directory.hh b/src/FbTk/FileUtil.hh
index f138ce7..718ccb8 100644
--- a/src/FbTk/Directory.hh
+++ b/src/FbTk/FileUtil.hh
@@ -1,5 +1,5 @@
-// Directory.hh
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// FileUtil.hh
+// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -21,19 +21,49 @@
 
 // $Id$
 
-#ifndef FBTK_DIRECTORY_HH
-#define FBTK_DIRECTORY_HH
-
-#include "NotCopyable.hh"
+#ifndef FBTK_FILEUTIL_HH
+#define FBTK_FILEUTIL_HH
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+#ifdef HAVE_CTIME
+  #include <ctime>
+#else
+  #include <time.h>
+#endif
 #include <sys/types.h>
 #include <dirent.h>
+
 #include <string>
 
+#include "NotCopyable.hh"
+
 namespace FbTk {
 
+/// Wrapper for file routines
+
+namespace FileUtil {
+
+    /// @return true if file is a directory
+    bool isDirectory(const char* filename);
+    /// @return true if a file is a regular file
+    bool isRegularFile(const char* filename);
+    /// @return true if a file executable for user
+    bool isExecutable(const char* filename);
+
+    /// gets timestamp of last status change
+    /// @return timestamp
+    /// @return -1 (failure)
+    time_t getLastStatusChangeTimestamp(const char* filename);
+
+    /// copies file 'from' to 'to'
+    bool copyFile(const char* from, const char* to);
+
+}; // end of File namespace
+    
 ///  Wrapper class for DIR * routines
-class Directory: private FbTk::NotCopyable {
+class Directory : private FbTk::NotCopyable {
 public:
     explicit Directory(const char *dir = 0);
     ~Directory();
@@ -52,12 +82,6 @@ public:
     bool open(const char *dir);
     /// @return number of entries in the directory
     size_t entries() const { return m_num_entries; }
-    /// @return true if file is a directory
-    static bool isDirectory(const std::string &filename);
-    /// @return true if a file is a regular file
-    static bool isRegularFile(const std::string &filename);
-    /// @return true if a file executable for user
-    static bool isExecutable(const std::string &filename);
     
 private:
     std::string m_name;
@@ -67,4 +91,4 @@ private:
 
 } // end namespace FbTk
 
-#endif // FBTK_DIRECTORY_HH
+#endif // FBTK_FILEUTIL_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 49217bc..be9b3ef 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -13,7 +13,7 @@ xpm_SOURCE= ImageXPM.hh ImageXPM.cc
 endif
 
 libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
-        Directory.hh Directory.cc \
+        FileUtil.hh FileUtil.cc \
         EventHandler.hh EventManager.hh EventManager.cc \
         FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
         I18n.cc I18n.hh \
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 40c68e9..5225686 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -26,7 +26,7 @@
 #include "XrmDatabaseHelper.hh"
 #include "App.hh"
 #include "StringUtil.hh"
-#include "Directory.hh"
+#include "FileUtil.hh"
 #include "I18n.hh"
 #include "Image.hh"
 
@@ -87,14 +87,14 @@ bool ThemeManager::load(const std::string &filename, int screen_num) {
     std::string location = FbTk::StringUtil::expandFilename(filename);
     std::string prefix = "";
 
-    if (Directory::isDirectory(filename)) {
+    if (FileUtil::isDirectory(filename.c_str())) {
         prefix = location;
 
         location.append("/theme.cfg");
-        if (!Directory::isRegularFile(location)) {
+        if (!FileUtil::isRegularFile(location.c_str())) {
             location = prefix;
             location.append("/style.cfg");
-            if (!Directory::isRegularFile(location)) {
+            if (!FileUtil::isRegularFile(location.c_str())) {
                 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
                 return false;
             }