Refactor path handling for conditional symlink handling at all levels…

…, not just at root path level

libfswatch/src/libfswatch/c++/kqueue_monitor.cpp

@@ -198,7 +198,7 @@ namespace fsw
 
       // TODO: C++17 doesn't provide a single, comparable, type to represent st_mode
       struct stat fd_stat;
-      if (!lstat_path(path, fd_stat)) return;
+      if (!stat_path(path, fd_stat, follow_symlinks)) return;
       if (!add_watch(path, fd_stat)) return;
       if (!recursive || !is_dir) return;
 

libfswatch/src/libfswatch/c++/path_utils.cpp

@@ -63,14 +63,30 @@ namespace fsw
     return entries;
   }
 
+  bool stat_path(const std::string& path, struct stat& fd_stat, bool follow_symlink)
+  {
+    if (follow_symlink)
+    {
+      if (lstat(path.c_str(), &fd_stat) == 0)
+        return true;
+    }
+    else
+    {
+      if (stat(path.c_str(), &fd_stat) == 0)
+        return true;
+    }
+
+    fsw_logf_perror(_("Cannot stat %s"), path.c_str());
+    return false;
+  }
+
   bool stat_path(const std::string& path, struct stat& fd_stat)
   {
     if (stat(path.c_str(), &fd_stat) == 0)
       return true;
 
     fsw_logf_perror(_("Cannot stat %s"), path.c_str());
     return false;
-
   }
 
   bool lstat_path(const std::string& path, struct stat& fd_stat)

libfswatch/src/libfswatch/c++/path_utils.hpp

@@ -69,5 +69,19 @@ namespace fsw
    * @return @c true if the function succeeds, @c false otherwise.
    */
   bool stat_path(const std::string& path, struct stat& fd_stat);
+
+  /**
+   * @brief Wraps a @c stat(path, fd_stat) call or a @c lstat(path, fd_stat)
+   * call, depending on the value of @p follow_symlink.  The function invokes
+   * @c perror() if it fails.
+   * 
+   * @param path The path to @c stat() or @c lstat().
+   * @param fd_stat The @c stat structure where @c stat() or @c lstat() writes
+   * its results.
+   * @param follow_symlink @c true if the function should call @c lstat(),
+   * @c false if it should call @c stat().
+   * @return @c true if the function succeeds, @c false otherwise.
+   */
+  bool stat_path(const std::string& path, struct stat& fd_stat, bool follow_symlink);
 }
 #endif  /* FSW_PATH_UTILS_H */

libfswatch/src/libfswatch/c++/poll_monitor.cpp

@@ -137,7 +137,7 @@ namespace fsw
       // TODO: C++17 doesn't standardize access to ctime, so we need to keep
       // using lstat for now.
       struct stat fd_stat;
-      if (!lstat_path(path, fd_stat)) return;
+      if (!stat_path(path, fd_stat, follow_symlinks)) return;
 
       if (!add_path(path, fd_stat, fn)) return;
       if (!recursive) return;