X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Ftools%2Fclam_tools%2Fvalue_tagger.cpp;h=076853a4dbe26c143ae5ef232b29ba6451bc9df3;hb=8304d2f6d1de89070ebc8c981ef1f20456f06006;hp=0975186e5e54f1e46fa0637415fa8f5570a5f6f0;hpb=3ea085ec301ed1399dfa1e9f3a240312dc95410b;p=feisty_meow.git diff --git a/nucleus/tools/clam_tools/value_tagger.cpp b/nucleus/tools/clam_tools/value_tagger.cpp index 0975186e..076853a4 100644 --- a/nucleus/tools/clam_tools/value_tagger.cpp +++ b/nucleus/tools/clam_tools/value_tagger.cpp @@ -200,7 +200,7 @@ private: ini_configurator *_ini; // the configuration for what we'll scan. string_table _dirs; // the list of directories. string_table _dirs_seen; // full list of already processed directories. - astring _manifest_filename; // the name of the manifest we'll create. + filename _manifest_filename; // the name of the manifest we'll create. byte_filer _manifest; // the actual file we're building. active_searches _search_list; // tracks our progress in scanning files. int_array _search_ordering; @@ -352,8 +352,8 @@ variables before running a build.\r\n"; _ini = new ini_configurator(ini_file, ini_configurator::RETURN_ONLY); // read the name of the manifest file to create. - _manifest_filename = _ini->load("manifest", "output", ""); - if (!_manifest_filename) { + _manifest_filename = filename(_ini->load("manifest", "output", "")); + if (!_manifest_filename.raw().length()) { non_continuable_error(class_name(), ini_file, "The 'output' file entry is missing"); } _manifest_filename = parser_bits::substitute_env_vars(_manifest_filename); @@ -373,7 +373,7 @@ variables before running a build.\r\n"; } for (int i = 0; i < temp_dirs.symbols(); i++) { //log(astring("curr is ") + current); - astring current = parser_bits::substitute_env_vars(temp_dirs.name(i)); + filename current = filename(parser_bits::substitute_env_vars(temp_dirs.name(i))); _dirs.add(current, ""); }