X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=inline;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=c8cc179fb67048e38f0fb749f4e9df1ff45d91eb;hb=0f0df8de389914b66cf70759575eef0b8261c797;hp=9302c0b8b10f8a5fd3fdcc250410aeab33f705fd;hpb=36a9a07fc0d58746df4b6e9f2d1accca9b77d64a;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index 9302c0b8..c8cc179f 100644 --- a/nucleus/library/configuration/application_configuration.cpp +++ b/nucleus/library/configuration/application_configuration.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -28,13 +29,11 @@ #include #include #endif -#ifdef __WIN32__ +#ifdef _MSC_VER #include #include #else #include -#endif -#ifdef __UNIX__ #include #include #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"); @@ -101,9 +100,9 @@ astring application_configuration::get_cmdline_from_proc() filename testing(__check_once_app_path); if (testing.had_directory()) return __check_once_app_path; // all set. -//hmmm: the below might be better off as a find app in path method, which relies on which. -printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s()); +//printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s()); +//hmmm: the below might be better off as a find app in path method, which relies on which. // there was no directory component, so we'll try to guess one. astring temp_filename(environment::TMP() + a_sprintf("/zz_cmdfind.%d", chaos().inclusive(0, 999999999))); @@ -136,7 +135,7 @@ printf("no dir part found, app name after chewing: %s\n", __check_once_app_path. // 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); @@ -291,15 +290,57 @@ const astring &application_configuration::GLOBAL_SECTION_NAME() { STATIC_STRING( const astring &application_configuration::LOGGING_FOLDER_NAME() { STATIC_STRING("LogPath"); } +const astring &application_configuration::WINDOZE_VIRTUAL_ROOT_NAME() +{ STATIC_STRING("VirtualUnixRoot"); } + +const astring &application_configuration::DEFAULT_VIRTUAL_UNIX_ROOT() +{ STATIC_STRING("c:/cygwin"); } + ////////////// -const int MAX_LOG_PATH = 200; +// static storage for virtual unix root, if used. +SAFE_STATIC(astring, static_root_holder, ) + +// we don't expect it to change during runtime, right? that would be fubar. +astring application_configuration::get_virtual_unix_root() +{ +#ifdef __UNIX__ + // simple implementation for unix/linux; just tell the truth about the real root. + return "/"; +#endif +#ifdef __WIN32__ + // see if we already cached the root. it shouldn't change during runtime. + if (static_root_holder().length()) { + return static_root_holder(); + } + + /* + read the path out of the config file, which should have been set during the + build process if this is really windows. + */ + astring virtual_root = read_item(WINDOZE_VIRTUAL_ROOT_NAME()); + if (!virtual_root) { + // if it has no length, we didn't get our setting! we'll limp along with a guess. + // also don't cache the failure value. maybe it will wake up later! + return DEFAULT_VIRTUAL_UNIX_ROOT(); + } else { + static_root_holder() = virtual_root; + return static_root_holder(); + } + +#endif +} + +////////////// + +////const int MAX_LOG_PATH = 512; // the maximum length of the entry stored for the log path. astring application_configuration::get_logging_directory() { - // start with the root of our installation. - astring def_log = application_directory(); + // new scheme is to just use the temporary directory, which can vary per user + // and which hopefully is always set to something usable. + astring def_log = environment::TMP(); // add logs directory underneath that. def_log += "/logs"; // add the subdirectory for logs. @@ -309,6 +350,7 @@ astring application_configuration::get_logging_directory() // get the entry for the logging path. if (!log_dir) { // if the entry was absent, we set it. +//printf("did not find log dir in config file\n"); ini_configurator ini(application_configuration_file(), ini_configurator::RETURN_ONLY, ini_configurator::APPLICATION_DIRECTORY); @@ -317,25 +359,25 @@ astring application_configuration::get_logging_directory() // they gave us something. let's replace the environment variables // in their string so we resolve paths and such. log_dir = parser_bits::substitute_env_vars(log_dir); +//printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s()); } // 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; }