fix(SymlinkingPrebuiltDictionaries): remove dangling symlinks

Closes #241
rime · Jan 5, 2019 · 5ad333d · 5ad333d
1 parent f8e4ebf
commit 5ad333d
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/rime/lever/deployment_tasks.cc b/src/rime/lever/deployment_tasks.cc
@@ -478,21 +478,20 @@ bool SymlinkingPrebuiltDictionaries::Run(Deployer* deployer) {
     if (fs::is_symlink(entry)) {
       try {
         // a symlink becomes dangling if the target file is no longer provided
-        bool symlink_valid = fs::status_known(fs::symlink_status(entry));
-        bool linked_to_shared_data = false;
-        if (symlink_valid) {
-          auto target_path = fs::canonical(entry);
-          linked_to_shared_data =
-              target_path.has_parent_path() &&
-              fs::equivalent(shared_data_path, target_path.parent_path());
-        }
-        if (!symlink_valid || linked_to_shared_data) {
+        boost::system::error_code ec;
+        auto target_path = fs::canonical(entry, ec);
+        bool bad_link = bool(ec);
+        bool linked_to_shared_data =
+            !bad_link &&
+            target_path.has_parent_path() &&
+            fs::equivalent(shared_data_path, target_path.parent_path());
+        if (bad_link || linked_to_shared_data) {
           LOG(INFO) << "removing symlink: " << entry.filename().string();
           fs::remove(entry);
         }
       }
       catch (const fs::filesystem_error& ex) {
-        LOG(ERROR) << ex.what();
+        LOG(ERROR) << entry << ": " << ex.what();
         success = false;
       }
     }