# # patch "ChangeLog" # from [d3f03473434eb0b0da2510952d4ab8611e363002] # to [bb1755209e927d2d4b105e619ed0d2316e7aa194] # # patch "commands.cc" # from [1a13b18406cd0813aca1644fba757b591ff6df5f] # to [0810ba0819d92e2e93db7c7e2769429d1e8a64ad] # ======================================================================== --- ChangeLog d3f03473434eb0b0da2510952d4ab8611e363002 +++ ChangeLog bb1755209e927d2d4b105e619ed0d2316e7aa194 @@ -1,5 +1,9 @@ 2005-08-23 Nathaniel Smith + * commands.cc (pid_file): Remove fs::path. + +2005-08-23 Nathaniel Smith + * mkstemp.cc (monotone_mkstemp): Remove references to fs::path. 2005-08-23 Nathaniel Smith ======================================================================== --- commands.cc 1a13b18406cd0813aca1644fba757b591ff6df5f +++ commands.cc 0810ba0819d92e2e93db7c7e2769429d1e8a64ad @@ -15,10 +15,6 @@ #include #include #include -#include -#include -#include -#include #include #include "commands.hh" @@ -280,12 +276,12 @@ struct pid_file { - explicit pid_file(fs::path const & p) + explicit pid_file(system_path const & p) : path(p) { if (path.empty()) return; - N(!fs::exists(path), F("pid file '%s' already exists") % path.string()); + N(!path_exists(path), F("pid file '%s' already exists") % path); file.open(path); file << get_process_id(); file.flush(); @@ -296,16 +292,16 @@ if (path.empty()) return; pid_t pid; - fs::ifstream(path) >> pid; + fs::ifstream(path.as_external()) >> pid; if (pid == get_process_id()) { file.close(); - fs::remove(path); + delete_file(path); } } private: fs::ofstream file; - fs::path path; + system_path path; }; static void