Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-25 04:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(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

Browse Source
This commit is contained in:
Jordan Lee
2014-07-08 00:08:43 +00:00
parent d7f4478679
commit 0323639e57
26 changed files with 235 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libtransmission/platform.c
View File

@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h> /* getuid(), close() */
#include <sys/stat.h>
#ifdef _WIN32
#include <w32api.h>
@@ -39,10 +38,11 @@
#endif
#include "transmission.h"
#include "session.h"
#include "file.h"
#include "list.h"
#include "log.h"
#include "platform.h"
#include "session.h"
/***
**** THREADS
@@ -399,9 +399,8 @@ tr_getDefaultDownloadDir (void)
static int
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);
@@ -490,8 +489,11 @@ tr_getWebClientDir (const tr_session * session UNUSED)
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))
{
tr_free (s);