#endif
#include <simgear/misc/sg_dir.hxx>
+#include <math.h>
+#include <stdlib.h>
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
#include <boost/foreach.hpp>
#include <cstring>
+#include <cstdlib>
#include <iostream>
+#include <algorithm> // for std::sort
using std::string;
namespace simgear
{
-Dir::Dir()
+Dir::Dir() :
+ _removeOnDestroy(false)
{
}
Dir::Dir(const SGPath& path) :
- _path(path)
+ _path(path),
+ _removeOnDestroy(false)
{
_path.set_cached(false); // disable caching, so create/remove work
}
Dir::Dir(const Dir& rel, const SGPath& relPath) :
- _path(rel.file(relPath.str()))
+ _path(rel.file(relPath.str())),
+ _removeOnDestroy(false)
{
_path.set_cached(false); // disable caching, so create/remove work
}
+Dir::~Dir()
+{
+ if (_removeOnDestroy) {
+ remove(true);
+ }
+}
+
+void Dir::setRemoveOnDestroy()
+{
+ _removeOnDestroy = true;
+}
+
Dir Dir::current()
{
#ifdef _WIN32
{
#ifdef HAVE_MKDTEMP
char buf[1024];
- char* tempPath = ::getenv("TMPDIR");
+ const char* tempPath = ::getenv("TMPDIR");
if (!tempPath) {
- tempPath = "/tmp/";
+ tempPath = "/tmp";
}
+ SGPath p(tempPath);
+ p.append(templ);
// Mac OS-X / BSD manual says any number of 'X's, but GLibc manual
// says exactly six, so that's what I'm going with
- ::snprintf(buf, 1024, "%s%s-XXXXXX", tempPath, templ.c_str());
+ p.concat("-XXXXXX");
+ ::snprintf(buf, 1024, "%s", p.c_str());
if (!mkdtemp(buf)) {
SG_LOG(SG_IO, SG_WARN, "mkdtemp failed:" << strerror(errno));
return Dir();
#endif
}
+static bool pathSortPredicate(const SGPath& p1, const SGPath& p2)
+{
+ return p1.file() < p2.file();
+}
+
PathList Dir::children(int types, const std::string& nameFilter) const
{
PathList result;
closedir(dp);
#endif
+
+ // File system order is random. Make things deterministic,
+ // so it's the same for every user.
+ std::sort(result.begin(), result.end(), pathSortPredicate);
+
return result;
}
// recursively create parent directories
Dir pr(parent());
- if (!pr.exists()) {
+ if (!pr.path().isNull() && !pr.exists()) {
bool ok = pr.create(mode);
if (!ok) {
return false;