Changeset 14320 for trunk/libtransmission/platform.c

Timestamp:

Jul 8, 2014, 12:08:43 AM (7 years ago)

Author:

jordan

Message:

(trunk, libT) #4160 'foreign character support' -- merge mike.dld's 4160-02b-path.patch, which updates the codebase to use the new tr_sys_path_*() portability wrappers introduced in 4160-02a

File:

• trunk/libtransmission/platform.c (modified) (4 diffs)

trunk/libtransmission/platform.c

@@ -18 +18 @@
 #include <string.h>
 #include <unistd.h> /* getuid(), close() */
-#include <sys/stat.h>
 
 #ifdef _WIN32
@@ -40 +39 @@
 
 #include "transmission.h"
-#include "session.h"
+#include "file.h"
 #include "list.h"
 #include "log.h"
 #include "platform.h"
+#include "session.h"
 
 /***
@@ -400 +400 @@
 isWebClientDir (const char * path)
 {
-  struct stat sb;
   char * tmp = tr_buildPath (path, "index.html", NULL);
-  const int ret = !stat (tmp, &sb);
+  const bool ret = tr_sys_path_exists (tmp, NULL);
   tr_logAddInfo (_("Searching for web interface file \"%s\""), tmp);
   tr_free (tmp);
@@ -491 +490 @@
             if (s == NULL) /* check calling module place */
               {
+                char * tmp;
                 GetModuleFileName (GetModuleHandle (NULL), dir, sizeof (dir));
-                s = tr_buildPath (dirname (dir), "Web", NULL);
+                tmp = tr_sys_path_dirname (dir, NULL);
+                s = tr_buildPath (tmp, "Web", NULL);
+                tr_free (tmp);
                 if (!isWebClientDir (s))
                   {