X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ffilesystem%2Ffilename.cpp;h=4abca2ade98b462c6f75404f1e34baf54fd0b6d6;hb=e16e899f1a75d8c4df9d36ffac2d8d2d401c4114;hp=d12d9e7e58825b735a2f93911591abc842ed5850;hpb=7c0f7da17305e9b330b1370e6af250df0b72cca9;p=feisty_meow.git diff --git a/nucleus/library/filesystem/filename.cpp b/nucleus/library/filesystem/filename.cpp index d12d9e7e..4abca2ad 100644 --- a/nucleus/library/filesystem/filename.cpp +++ b/nucleus/library/filesystem/filename.cpp @@ -19,18 +19,8 @@ #include #include -#include -/* - 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 +#include #include #include @@ -265,13 +255,14 @@ if (inject_root) LOG("decided to inject root since path is '/'."); 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); +///nope configuration::application_configuration::get_virtual_unix_root()); +LOG(astring("turned cygdrive path string into: ") + raw()); } #endif