X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futils.h;h=a6d956869bf633d531d35e24636b8b37519e35f4;hp=47efcacd9ddb24e299411793ca745ada759ac829;hb=a17d6ad286e19e2222ab8b6c9a762a83bf2c6c56;hpb=0ba3e9d15af4e8c30eef5445d2b64fee4870505f

diff --git a/source/utils.h b/source/utils.h
index 47efcac..a6d9568 100644
--- a/source/utils.h
+++ b/source/utils.h
@@ -1,76 +1,49 @@
 /* $Id$
 
-This file is part of libmsppath
-Copyright © 2006-2007  Mikko Rasa, Mikkosoft Productions
+This file is part of libmspfs
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#ifndef MSP_PATH_UTILS_H_
-#define MSP_PATH_UTILS_H_
-
-#include <sys/stat.h>
-#include <list>
-#include <string>
+#ifndef MSP_FS_UTILS_H_
+#define MSP_FS_UTILS_H_
 
 namespace Msp {
+namespace FS {
 
 class Path;
 
-struct Filename
-{
-	std::string base;
-	std::string ext;
-};
-
-Path fix_case(const Path &path);
-
-/// Creates a directory
-void mkdir(const Path &path, int mode);
-
-/// Creates a directory and any required parent directories
-void mkpath(const Path &path, int mode);
-
-/// Removes a directory
-void rmdir(const Path &path);
-
-/// Removes a directory and anything it contains
-void rmdirs(const Path &path);
-
-/// Removes a file
-void unlink(const Path &path);
-
-/// Lists the contents of a directory
-std::list<std::string> list_files(const Path &path);
+/// Extracts the last component of the path.
+std::string basename(const Path &);
 
-Filename splitext(const std::string &);
-int fnmatch(const std::string &, const Path &);
+/// Removes the last component from the path.
+Path dirname(const Path &);
 
-/// Makes a path relative to some base path.  That is, base/result==path.
-Path relative(const Path &path, const Path &base);
-
-std::string basename(const std::string &);
-
-/// Tests for existence of a file
-bool exists(const Path &path);
+/**
+Returns the base part of a filename.  This includes everything up to the last
+dot, but not the dot itself.
+*/
+std::string basepart(const std::string &);
 
 /**
-Gets information about a file.  Returns 0 on success or -1 on error.  This
-version can be used to check for file existence and get information in one
-call.
+Returns the extension part of a filename.  This includes the last dot and
+everything after it.
 */
-int stat(const Path &fn, struct stat &st);
+std::string extpart(const std::string &);
 
 /**
-Returns information about a file.  This version throws an exception if an error
-occurs.
+Fixes the case of the given path to match files / directories on the
+filesystem.
 */
-struct stat stat(const Path &fn);
+Path fix_case(const Path &path);
 
-Path getcwd();
+/// Removes a file
+void unlink(const Path &path);
 
-inline bool is_windows_drive(const std::string &p)
-{ return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); }
+/// Makes a path relative to some base path.  That is, base/result==path.
+Path relative(const Path &path, const Path &base);
 
+} // namespace FS
 } // namespace Msp
 
 #endif