X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ffilesystem%2Fdirectory.cpp;h=f1341e683f50f197122882ce781c2094fd8a2ddc;hb=0f0df8de389914b66cf70759575eef0b8261c797;hp=a122d577fd15edec2474762c03528d0ba655954f;hpb=7a381305a6cd14cf4254b6259a3ffb0e1912b390;p=feisty_meow.git

diff --git a/nucleus/library/filesystem/directory.cpp b/nucleus/library/filesystem/directory.cpp
index a122d577..f1341e68 100644
--- a/nucleus/library/filesystem/directory.cpp
+++ b/nucleus/library/filesystem/directory.cpp
@@ -15,7 +15,6 @@
 #include "directory.h"
 #include "filename.h"
 
-#include <algorithms/shell_sort.h>
 #include <application/windoze_helper.h>
 #include <basis/astring.h>
 #include <basis/contracts.h>
@@ -27,13 +26,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#ifdef __UNIX__
+
+#include "../algorithms/sorts.h"
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   #include <dirent.h>
   #include <fnmatch.h>
   #include <string.h>
   #include <unistd.h>
 #endif
-#ifdef __WIN32__
+#ifdef _MSC_VER
   #include <direct.h>
 #endif
 
@@ -47,6 +48,9 @@
 #endif
 */
 
+//#define DEBUG_DIRECTORY
+  // uncomment for noisier runs.
+
 #undef LOG
 #define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s)
 
@@ -98,7 +102,7 @@ astring directory::absolute_path(const astring &rel_path)
 {
   char abs_path[MAX_ABS_PATH + 1];
   abs_path[0] = '\0';
-#ifdef __WIN32__
+#ifdef _MSC_VER
   if (!_fullpath(abs_path, rel_path.s(), MAX_ABS_PATH)) return "";
   return abs_path;
 #else
@@ -110,7 +114,7 @@ astring directory::absolute_path(const astring &rel_path)
 astring directory::current()
 {
   astring to_return(".");  // failure result.
-#ifdef __WIN32__
+#ifdef _MSC_VER
   flexichar buffer[MAX_ABS_PATH + 1] = { '\0' };
   GetCurrentDirectory(MAX_ABS_PATH, buffer);
   to_return = from_unicode_temp(buffer);
@@ -148,7 +152,7 @@ bool directory::rescan()
   _folders->reset();
   astring cur_dir = ".";
   astring par_dir = "..";
-#ifdef __WIN32__
+#ifdef _MSC_VER
   // start reading the directory.
   WIN32_FIND_DATA wfd;
   astring real_path_spec = *_path + "/" + *_pattern;
@@ -161,20 +165,16 @@ bool directory::rescan()
     if (!strcmp(filename_transcoded.s(), par_dir.s())) continue;
 
 #ifdef UNICODE
-/*temp
-    to_unicode_persist(fudgemart, filename_transcoded);
-    if (memcmp((wchar_t*)fudgemart, wfd.cFileName, wcslen(wfd.cFileName)*2))
+  #ifdef DEBUG_DIRECTORY
+    to_unicode_persist(kludgemart, filename_transcoded);
+    if (memcmp((wchar_t*)kludgemart, wfd.cFileName, wcslen(wfd.cFileName)*2))
       printf("failed to compare the string before and after transcoding\n");
-*/
+  #endif
 #endif
 
 //wprintf(to_unicode_temp("file is %ls\n"), (wchar_t*)to_unicode_temp(filename_transcoded));
     
     filename temp_name(*_path, filename_transcoded.s());
-    if (!temp_name.is_normal()) {
-      LOG(astring("skipping abnormal file:  ") + temp_name);
-      continue;  // cannot be adding goofy named pipes etc; cannot manage those.
-    }
 
     // add this to the appropriate list.
     if (temp_name.is_directory()) {
@@ -183,18 +183,19 @@ bool directory::rescan()
       _files->concatenate(filename_transcoded);
 
 #ifdef UNICODE
-      to_unicode_persist(fudgemart2, temp_name.raw());
-      FILE *fpjunk = _wfopen(fudgemart2, to_unicode_temp("rb"));
+  #ifdef DEBUG_DIRECTORY
+      to_unicode_persist(kludgemart2, temp_name.raw());
+      FILE *fpjunk = _wfopen(kludgemart2, to_unicode_temp("rb"));
       if (!fpjunk)
         LOG(astring("failed to open the file for testing: ") + temp_name.raw() + "\n");
       if (fpjunk) fclose(fpjunk);
+  #endif
 #endif
 
 	}
   } while (FindNextFile(search_handle, &wfd));
   FindClose(search_handle);
-#endif
-#ifdef __UNIX__
+#else
   DIR *dir = opendir(_path->s());
 //hmmm: could check errno to determine what caused the problem.
   if (!dir) return false;
@@ -207,6 +208,13 @@ bool directory::rescan()
     // make sure that the filename matches the pattern also.
     if (add_it && !fnmatch(_pattern->s(), file, 0)) {
       filename temp_name(*_path, file);
+      if (!temp_name.is_normal()) {
+//#ifdef DEBUG_DIRECTORY
+        LOG(astring("skipping abnormal file:  ") + temp_name);
+//#endif
+        entry = readdir(dir);
+        continue;  // cannot be adding goofy named pipes etc; cannot manage those.
+      }
       // add this to the appropriate list.
       if (temp_name.is_directory())
         _folders->concatenate(file);
@@ -226,10 +234,9 @@ bool directory::rescan()
 
 bool directory::make_directory(const astring &path)
 {
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   int mk_ret = mkdir(path.s(), 0777);
-#endif
-#ifdef __WIN32__
+#else
   int mk_ret = mkdir(path.s());
 #endif
   return !mk_ret;
@@ -237,10 +244,9 @@ bool directory::make_directory(const astring &path)
 
 bool directory::remove_directory(const astring &path)
 {
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   int rm_ret = rmdir(path.s());
-#endif
-#ifdef __WIN32__
+#else
   int rm_ret = rmdir(path.s());
 #endif
   return !rm_ret;
@@ -248,15 +254,16 @@ bool directory::remove_directory(const astring &path)
 
 bool directory::recursive_create(const astring &directory_name)
 {
-//  FUNCDEF("recursive_create");
+  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;
-    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()] == ':')
@@ -274,3 +281,4 @@ bool directory::recursive_create(const astring &directory_name)
 }
 
 } // namespace.
+