From 607514be9b86daa05435aefafea08e9889a08624 Mon Sep 17 00:00:00 2001 From: Isaac Turner Date: Fri, 26 Apr 2024 09:06:08 +0800 Subject: [PATCH 1/3] [ntcore] backup file if it fails to open --- ntcore/src/main/native/cpp/NetworkServer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntcore/src/main/native/cpp/NetworkServer.cpp b/ntcore/src/main/native/cpp/NetworkServer.cpp index e98936a73bc..85034ef8b5c 100644 --- a/ntcore/src/main/native/cpp/NetworkServer.cpp +++ b/ntcore/src/main/native/cpp/NetworkServer.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -359,6 +360,9 @@ void NetworkServer::LoadPersistent() { "could not open persistent file '{}': {} " "(this can be ignored if you aren't expecting persistent values)", m_persistentFilename, ec.message()); + // backup file + fs::copy_file(m_persistentFilename, m_persistentFilename + ".bak", + std::filesystem::copy_options::overwrite_existing, ec); // try to write an empty file so it doesn't happen again wpi::raw_fd_ostream os{m_persistentFilename, ec, fs::F_Text}; if (ec.value() == 0) { From f048134a4b48fe84644dd69fc46989ebf02b1aa9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 01:11:35 +0000 Subject: [PATCH 2/3] Formatting fixes --- ntcore/src/main/native/cpp/NetworkServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntcore/src/main/native/cpp/NetworkServer.cpp b/ntcore/src/main/native/cpp/NetworkServer.cpp index 85034ef8b5c..972dea13f8e 100644 --- a/ntcore/src/main/native/cpp/NetworkServer.cpp +++ b/ntcore/src/main/native/cpp/NetworkServer.cpp @@ -7,8 +7,8 @@ #include #include -#include #include +#include #include #include From 212c22b1a953a05ec4943b2562805b983198db37 Mon Sep 17 00:00:00 2001 From: Isaac Turner Date: Fri, 26 Apr 2024 20:49:41 +0800 Subject: [PATCH 3/3] fix --- ntcore/src/main/native/cpp/NetworkServer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ntcore/src/main/native/cpp/NetworkServer.cpp b/ntcore/src/main/native/cpp/NetworkServer.cpp index 972dea13f8e..26dd9408297 100644 --- a/ntcore/src/main/native/cpp/NetworkServer.cpp +++ b/ntcore/src/main/native/cpp/NetworkServer.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include #include