Bug 1358134 - Don't use dirent.h in DBTool to check whether a DB exists r=franziskus

Differential Revision: https://nss-review.dev.mozaws.net/D326

1 files changed, 8 insertions, 9 deletions

diff --git a/nss-tool/db/dbtool.cc b/nss-tool/db/dbtool.cc
index 5bdeec56e..8c369cf05 100644
--- a/nss-tool/db/dbtool.cc
+++ b/nss-tool/db/dbtool.cc
@@ -7,7 +7,6 @@
 #include "scoped_ptrs.h"
 #include "util.h"
 
-#include <dirent.h>
 #include <iomanip>
 #include <iostream>
 #include <regex>
@@ -171,24 +170,24 @@ bool DBTool::PathHasDBFiles(std::string path) {
   std::regex certDBPattern("cert.*\\.db");
   std::regex keyDBPattern("key.*\\.db");
 
-  DIR *dir;
-  if (!(dir = opendir(path.c_str()))) {
+  PRDir *dir = PR_OpenDir(path.c_str());
+  if (!dir) {
     std::cerr << "Directory " << path << " could not be accessed!" << std::endl;
     return false;
   }
 
-  struct dirent *ent;
+  PRDirEntry *ent;
   bool dbFileExists = false;
-  while ((ent = readdir(dir))) {
-    if (std::regex_match(ent->d_name, certDBPattern) ||
-        std::regex_match(ent->d_name, keyDBPattern) ||
-        "secmod.db" == std::string(ent->d_name)) {
+  while ((ent = PR_ReadDir(dir, PR_SKIP_BOTH))) {
+    if (std::regex_match(ent->name, certDBPattern) ||
+        std::regex_match(ent->name, keyDBPattern) ||
+        "secmod.db" == std::string(ent->name)) {
       dbFileExists = true;
       break;
     }
   }
 
-  closedir(dir);
+  (void)PR_CloseDir(dir);
   return dbFileExists;
 }