updates from orpheus for windoze build

[feisty_meow.git] / nucleus / library / filesystem / filename.cpp

diff --git a/nucleus/library/filesystem/filename.cpp b/nucleus/library/filesystem/filename.cpp
index d12d9e7e58825b735a2f93911591abc842ed5850..843b286cf099bf0fcdd0a1fbfe6e74933b2c7862 100644 (file)
--- a/nucleus/library/filesystem/filename.cpp
+++ b/nucleus/library/filesystem/filename.cpp
@@ -19,18 +19,8 @@
 
 #include <basis/byte_array.h>
 #include <basis/functions.h>
-#include <configuration/application_configuration.h>
-/*
- hmmm: note that we are relying on forward declared code here.
- the canonical ordering for feisty's nucleus has the filesystem code come before
- the configuration code, because the configuratin library uses filesystem features.
- not sure i want to resolve this bizarritude at this time, but it points to the
- need for a virtual interface at lower level than either filesystem or configuration
- libraries, so we can emplace the need for the virtual unix root as a low-level
- dependency to be implemented later.
- */
-
 #include <textual/parser_bits.h>
+#include <system_helper.h>
 
 #include <stdio.h>
 #include <sys/stat.h>
@@ -249,12 +239,12 @@ void filename::canonicalize()
   // style of path.
   bool inject_root = false;  // assume we don't need to do anything.
 
-LOG(astring("before root injection: ") + raw());
+//LOG(astring("before root injection: ") + raw());
 
   // condition here just checks if the path is only the root.
   if ( (length() == 1) && separator(get(0)) ) { inject_root = true; }
 
-if (inject_root) LOG("decided to inject root since path is '/'.");
+//if (inject_root) LOG("decided to inject root since path is '/'.");
 
   // condition is looking for first character being a slash, and second char as alphanumeric or dash or underscore.
   // we will currently fail detecting freaky paths that don't start off with alphanumeric or one of that small set of special chars.
@@ -262,16 +252,16 @@ if (inject_root) LOG("decided to inject root since path is '/'.");
       && separator(get(0)) 
       && ( textual::parser_bits::is_alphanumeric(get(1)) || ('-' == get(1)) || ('_' == get(1)) ) ) { 
     inject_root = true;
-if (inject_root) LOG(astring("decided to inject root since path is compatible: ") + *this);
+//if (inject_root) LOG(astring("decided to inject root since path is compatible: ") + *this);
   }
 
-LOG(astring("after second phase root injection: ") + *this);
+//LOG(astring("after second phase root injection: ") + raw());
 
   if (inject_root) {
     // inject the actual path to the unix root in front, if we know it.
     // if we don't know it, then a default path that's unlikely to work is idiotically plugged in.
-    insert(0, configuration::application_configuration::get_virtual_unix_root());
-LOG(astring("turned cygdrive path string into: ") + *this);
+    insert(0, FEISTY_MEOW_VIRTUAL_UNIX_ROOT);
+//LOG(astring("turned cygdrive path string into: ") + raw());
   }
 #endif