Changeset 7372 for branches/1.4x/libtransmission/platform.c

Timestamp:

Dec 14, 2008, 1:19:49 AM (9 years ago)

Author:

charles

Message:

(1.4x libT) #1595: Always search in PACKAGE_DATA_DIR when serving Web files

File:

• branches/1.4x/libtransmission/platform.c (modified) (2 diffs)

branches/1.4x/libtransmission/platform.c

@@ -103 +103 @@
     return tr_areThreadsEqual( tr_getCurrentThread( ), t->thread );
 }
+
+#include <event.h>
 
 #ifdef WIN32
@@ -583 +585 @@
 
             /* XDG_DATA_DIRS are the backup directories */
-            tmp = getenv( "XDG_DATA_DIRS" );
-            if( !tmp || !*tmp )
-                tmp =  PACKAGE_DATA_DIR ":/usr/local/share/:/usr/share/";
-            while( tmp && *tmp ) {
-                const char * end = strchr( tmp, ':' );
-                if( end ) {
-                    tr_list_append( &candidates, tr_strndup( tmp, end - tmp ) );
-                    tmp = end + 1;
-                } else {
-                    tr_list_append( &candidates, tr_strdup( tmp ) );
-                    break;
+            {
+                struct evbuffer * buf = evbuffer_new( );
+                evbuffer_add_printf( buf, "%s:", PACKAGE_DATA_DIR );
+                if(( tmp = getenv( "XDG_DATA_DIRS" )))
+                    evbuffer_add_printf( buf, "%s:", tmp );
+                evbuffer_add_printf( buf, "%s:", "/usr/local/share" );
+                evbuffer_add_printf( buf, "%s:", "/usr/share" );
+                tmp = (const char*) EVBUFFER_DATA( buf );
+                while( tmp && *tmp ) {
+                    const char * end = strchr( tmp, ':' );
+                    if( end ) {
+                        tr_list_append( &candidates, tr_strndup( tmp, end - tmp ) );
+                        tmp = end + 1;
+                    } else if( tmp && *tmp ) {
+                        tr_list_append( &candidates, tr_strdup( tmp ) );
+                        break;
+                    }
                 }
+                evbuffer_free( buf );
             }