(trunk, libt) #4160 - the slow slog to catch trunk up to mike.dld's 4160 diff continues. This step applies 4160-04b-dir.patch, which replaces native file operations with the tr_sys_dir_*() portability wrappers added in the previous commit.

daemon/remote.c

@@ -9,24 +9,19 @@
 
 #include <assert.h>
 #include <ctype.h> /* isspace */
-#include <errno.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h> /* strcmp */
 
-#ifdef _WIN32
- #include <direct.h> /* getcwd */
-#else
- #include <unistd.h> /* getcwd */
-#endif
-
 #include <event2/buffer.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>
 
 #include <libtransmission/transmission.h>
+#include <libtransmission/error.h>
+#include <libtransmission/file.h>
 #include <libtransmission/log.h>
 #include <libtransmission/rpcimpl.h>
 #include <libtransmission/tr-getopt.h>
@@ -498,21 +493,18 @@ static char*
 tr_getcwd (void)
 {
   char * result;
-  char buf[2048];
+  tr_error * error = NULL;
 
-#ifdef _WIN32
-  result = _getcwd (buf, sizeof (buf));
-#else
-  result = getcwd (buf, sizeof (buf));
-#endif
+  result = tr_sys_dir_get_current (&error);
 
   if (result == NULL)
     {
-      fprintf (stderr, "getcwd error: \"%s\"", tr_strerror (errno));
-      *buf = '\0';
+      fprintf (stderr, "getcwd error: \"%s\"", error->message);
+      tr_error_free (error);
+      result = tr_strdup ("");
     }
 
-  return tr_strdup (buf);
+  return result;
 }
 
 static char*

daemon/watch.c

@@ -19,8 +19,6 @@
 #include <string.h> /* strlen () */
 #include <stdio.h> /* perror () */
 
-#include <dirent.h> /* readdir */
-
 #include <libtransmission/transmission.h>
 #include <libtransmission/file.h>
 #include <libtransmission/log.h>
@@ -59,7 +57,7 @@ static void
 watchdir_new_impl (dtr_watchdir * w)
 {
     int i;
-    DIR * odir;
+    tr_sys_dir_t odir;
     w->inotify_fd = inotify_init ();
 
     if (w->inotify_fd < 0)
@@ -76,14 +74,11 @@ watchdir_new_impl (dtr_watchdir * w)
     {
         tr_logAddError ("Unable to watch \"%s\": %s", w->dir, tr_strerror (errno));
     }
-    else if ((odir = opendir (w->dir)))
+    else if ((odir = tr_sys_dir_open (w->dir, NULL)) != TR_BAD_SYS_DIR)
     {
-        struct dirent * d;
-
-        while ((d = readdir (odir)))
+        const char * name;
+        while ((name = tr_sys_dir_read_name (odir, NULL)) != NULL)
         {
-            const char * name = d->d_name;
-
             if (!tr_str_has_suffix (name, ".torrent")) /* skip non-torrents */
                 continue;
 
@@ -91,7 +86,7 @@ watchdir_new_impl (dtr_watchdir * w)
             w->callback (w->session, w->dir, name);
         }
 
-        closedir (odir);
+        tr_sys_dir_close (odir, NULL);
     }
 
 }
@@ -196,24 +191,22 @@ static void
 watchdir_update_impl (dtr_watchdir * w)
 {
     tr_sys_path_info info;
-    DIR * odir;
+    tr_sys_dir_t odir;
     const time_t oldTime = w->lastTimeChecked;
     const char * dirname = w->dir;
     struct evbuffer * curFiles = evbuffer_new ();
 
-    if ((oldTime + WATCHDIR_POLL_INTERVAL_SECS < time (NULL))
-         && tr_sys_path_get_info (dirname, 0, &info, NULL)
-         && info.type == TR_SYS_PATH_IS_DIRECTORY
-         && ((odir = opendir (dirname))))
+    if (oldTime + WATCHDIR_POLL_INTERVAL_SECS < time (NULL) &&
+        tr_sys_path_get_info (dirname, 0, &info, NULL) &&
+        info.type == TR_SYS_PATH_IS_DIRECTORY &&
+        (odir = tr_sys_dir_open (dirname, NULL)) != TR_BAD_SYS_DIR)
     {
-        struct dirent * d;
-
-        for (d = readdir (odir); d != NULL; d = readdir (odir))
+        const char * name;
+        while ((name = tr_sys_dir_read_name (odir, NULL)) != NULL)
         {
             size_t len;
-            const char * name = d->d_name;
 
-            if (!name || *name=='.') /* skip dotfiles */
+            if (*name == '.') /* skip dotfiles */
                 continue;
             if (!tr_str_has_suffix (name, ".torrent")) /* skip non-torrents */
                 continue;
@@ -228,7 +221,7 @@ watchdir_update_impl (dtr_watchdir * w)
             }
         }
 
-        closedir (odir);
+        tr_sys_dir_close (odir, NULL);
         w->lastTimeChecked = time (NULL);
         evbuffer_free (w->lastFiles);
         w->lastFiles = curFiles;