X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=d5ca0802568d1676fcf733fc50a258e54ba51594;hb=ea31dec826a360f97729000c351ea7e3e7aa9877;hp=a8f463ea0ada59712a3a94ea1b7f558bed2555ab;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index a8f463ea..d5ca0802 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"); @@ -91,6 +90,7 @@ astring application_configuration::get_cmdline_from_proc() // command line are all separated by zero characters. __check_once_app_path = filebuff; delete [] filebuff; +//printf("got an app name before chewing: %s\n", __check_once_app_path.s()); // clean out quote characters from the name. for (int i = __check_once_app_path.length() - 1; i >= 0; i--) { if (__check_once_app_path[i] == '"') __check_once_app_path.zap(i, i); @@ -100,10 +100,11 @@ 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()); +//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::get("TMP") + astring temp_filename(environment::TMP() + a_sprintf("/zz_cmdfind.%d", chaos().inclusive(0, 999999999))); system((astring("which ") + __check_once_app_path + " >" + temp_filename).s()); FILE *which_file = fopen(temp_filename.s(), "r"); @@ -134,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. @@ -189,24 +190,24 @@ astring application_configuration::query_for_process_info() fclose(output); \ unlink(tmpfile.s()); \ } \ - astring home_dir = env_string("HOME"); \ + astring home_dir = environment::get("HOME"); \ to_return = home_dir + "/failed_to_determine.exe"; \ } 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; @@ -217,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!") @@ -231,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); @@ -262,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,27 +292,14 @@ const astring &application_configuration::LOGGING_FOLDER_NAME() { STATIC_STRING( ////////////// -const int MAX_LOG_PATH = 200; +////const int MAX_LOG_PATH = 512; // the maximum length of the entry stored for the log path. -/* -astring application_configuration::installation_root() -{ - astring to_return = read_item(LOCAL_FOLDER_NAME()); - if (!to_return) { - // well, if this other guy has a path, we'll give that back. otherwise, - // we don't know what the path should be at all. - to_return = filename(application_configuration_file()).dirname(); - } - return to_return; -} -*/ - astring application_configuration::get_logging_directory() { - // start with the root of our installation. - astring def_log = application_directory(); -///installation_root(); + // 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. @@ -321,6 +309,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); @@ -329,33 +318,31 @@ 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; } astring application_configuration::make_logfile_name(const astring &base_name) { return get_logging_directory() + "/" + base_name; } -///astring application_configuration::core_bin_directory() { return read_item("core_bin"); } - astring application_configuration::read_item(const astring &key_name) { filename ini_name = application_configuration_file();