projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turned off some ancient personal variables.
[feisty_meow.git]
/
nucleus
/
library
/
filesystem
/
directory.cpp
diff --git
a/nucleus/library/filesystem/directory.cpp
b/nucleus/library/filesystem/directory.cpp
index 8e7789521e434281fb47837dcea7477efc403d1e..052c10bf994486a7148dc1fdc9ec5dad5671d5bb 100644
(file)
--- a/
nucleus/library/filesystem/directory.cpp
+++ b/
nucleus/library/filesystem/directory.cpp
@@
-209,9
+209,9
@@
bool directory::rescan()
if (add_it && !fnmatch(_pattern->s(), file, 0)) {
filename temp_name(*_path, file);
if (!temp_name.is_normal()) {
if (add_it && !fnmatch(_pattern->s(), file, 0)) {
filename temp_name(*_path, file);
if (!temp_name.is_normal()) {
-#ifdef DEBUG_DIRECTORY
+
//
#ifdef DEBUG_DIRECTORY
LOG(astring("skipping abnormal file: ") + temp_name);
LOG(astring("skipping abnormal file: ") + temp_name);
-#endif
+
//
#endif
entry = readdir(dir);
continue; // cannot be adding goofy named pipes etc; cannot manage those.
}
entry = readdir(dir);
continue; // cannot be adding goofy named pipes etc; cannot manage those.
}
@@
-259,12
+259,13
@@
bool directory::recursive_create(const astring &directory_name)
FUNCDEF("recursive_create");
filename dir(directory_name);
string_array pieces;
FUNCDEF("recursive_create");
filename dir(directory_name);
string_array pieces;
- dir.separate(pieces);
+ bool rooted;
+ dir.separate(rooted, pieces);
for (int i = 0; i < pieces.length(); i++) {
// check each location along the way.
string_array partial = pieces.subarray(0, i);
filename curr;
for (int i = 0; i < pieces.length(); i++) {
// check each location along the way.
string_array partial = pieces.subarray(0, i);
filename curr;
- curr.join(partial); // this is our current location.
+ curr.join(
rooted,
partial); // this is our current location.
// make sure, if we see a drive letter component, that we call it
// a proper directory name.
if (curr.raw()[curr.raw().end()] == ':')
// make sure, if we see a drive letter component, that we call it
// a proper directory name.
if (curr.raw()[curr.raw().end()] == ':')