X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=d5ca0802568d1676fcf733fc50a258e54ba51594;hb=e1127a793a9bfe64df1b3a5209c86bb66505fe28;hp=9502a3a8af715ffa6d9e9180c0a0342bdcace1bd;hpb=393c5d16bddb0ffef914699d2294ca2204dd16d7;p=feisty_meow.git

diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp
index 9502a3a8..d5ca0802 100644
--- a/nucleus/library/configuration/application_configuration.cpp
+++ b/nucleus/library/configuration/application_configuration.cpp
@@ -19,6 +19,7 @@
 #include <basis/guards.h>
 #include <basis/mutex.h>
 #include <basis/utf_conversion.h>
+#include <filesystem/directory.h>
 #include <filesystem/filename.h>
 #include <mathematics/chaos.h>
 #include <structures/static_memory_gremlin.h>
@@ -28,13 +29,11 @@
   #include <mach-o/dyld.h>
   #include <limits.h>
 #endif
-#ifdef __WIN32__
+#ifdef _MSC_VER
   #include <direct.h>
   #include <process.h>
 #else
   #include <dirent.h>
-#endif
-#ifdef __UNIX__
   #include <sys/utsname.h>
   #include <unistd.h>
 #endif
@@ -57,7 +56,7 @@ namespace configuration {
 const int MAXIMUM_COMMAND_LINE = 32 * KILOBYTE;
   // maximum command line that we'll deal with here.
 
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
 astring application_configuration::get_cmdline_from_proc()
 {
   FUNCDEF("get_cmdline_from_proc");
@@ -136,7 +135,7 @@ astring application_configuration::get_cmdline_from_proc()
 // deprecated; better to use the /proc/pid/cmdline file.
 astring application_configuration::query_for_process_info()
 {
-//  FUNCDEF("query_for_process_info");
+  FUNCDEF("query_for_process_info");
   astring to_return = "unknown";
   // we ask the operating system about our process identifier and store
   // the results in a temporary file.
@@ -197,18 +196,18 @@ astring application_configuration::query_for_process_info()
 
 astring application_configuration::application_name()
 {
-//  FUNCDEF("application_name");
+  FUNCDEF("application_name");
   astring to_return;
 #ifdef __APPLE__
   char buffer[MAX_ABS_PATH] = { '\0' };
   uint32_t buffsize = MAX_ABS_PATH - 1;
   _NSGetExecutablePath(buffer, &buffsize);
   to_return = (char *)buffer;
-#elif __UNIX__
+#elif defined(__UNIX__) || defined(__GNU_WINDOWS__)
   to_return = get_cmdline_from_proc();
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
   flexichar low_buff[MAX_ABS_PATH + 1];
-  GetModuleFileName(NIL, low_buff, MAX_ABS_PATH - 1);
+  GetModuleFileName(NULL_POINTER, low_buff, MAX_ABS_PATH - 1);
   astring buff = from_unicode_temp(low_buff);
   buff.to_lower();  // we lower-case the name since windows seems to UC it.
   to_return = buff;
@@ -219,7 +218,7 @@ astring application_configuration::application_name()
   return to_return;
 }
 
-#if defined(__UNIX__) || defined(__WIN32__)
+#if defined(__UNIX__) || defined(_MSC_VER) || defined(__GNU_WINDOWS__)
   basis::un_int application_configuration::process_id() { return getpid(); }
 #else
   #pragma error("hmmm: need process id implementation for this OS!")
@@ -233,7 +232,7 @@ astring application_configuration::current_directory()
   char buff[MAX_ABS_PATH];
   getcwd(buff, MAX_ABS_PATH - 1);
   to_return = buff;
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
   flexichar low_buff[MAX_ABS_PATH + 1];
   GetCurrentDirectory(MAX_ABS_PATH, low_buff);
   to_return = from_unicode_temp(low_buff);
@@ -264,7 +263,7 @@ structures::version application_configuration::get_OS_version()
   utsname kernel_parms;
   uname(&kernel_parms);
   to_return = version(kernel_parms.release);
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
   OSVERSIONINFO info;
   info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
   ::GetVersionEx(&info);
@@ -323,22 +322,21 @@ astring application_configuration::get_logging_directory()
   }
 
   // now we make sure the directory exists.
-  struct stat to_fill;
-  int stat_ret = stat(log_dir.observe(), &to_fill);
-  if (stat_ret || !(to_fill.st_mode & S_IFDIR) ) {
-    // if it's not anything yet or if it's not a directory, then we need
-    // to create it.
-//if it's something besides a directory... should it be deleted?
+  filename testing(log_dir);
+  if (!testing.exists()) {
+    bool okay = directory::recursive_create(log_dir);
+    if (!okay) {
+      LOG(astring("failed to create logging directory: ") + log_dir);
+      // return a directory almost guaranteed to exist; best we can do in this case.
 #ifdef __UNIX__
-    int mk_ret = mkdir(log_dir.s(), 0777);
+      return "/tmp";
 #endif
 #ifdef __WIN32__
-    int mk_ret = mkdir(log_dir.s());
+      return "c:/";
 #endif
-    if (mk_ret) return "";
-//can't have a log file if we can't make the directory successfully???
+    }
   }
-
+    
   return log_dir;
 }