X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=9f01391f8c61ebd1fdab010d5a0f7655c409941f;hb=80118cc1248b9569821aa245f900cf028a57f9f4;hp=a8f463ea0ada59712a3a94ea1b7f558bed2555ab;hpb=3ea085ec301ed1399dfa1e9f3a240312dc95410b;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index a8f463ea..9f01391f 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 @@ -91,6 +92,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 +102,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 +137,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,13 +192,13 @@ 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' }; @@ -291,27 +294,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 +311,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 +320,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();