Changeset 6924

Timestamp:

Oct 19, 2008, 5:43:04 PM (12 years ago)

Author:

charles

Message:

further win32 portability fixes from Spry

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• fdlimit.c (modified) (1 diff)
• net.h (modified) (2 diffs)
• platform.c (modified) (3 diffs)
• transmission.h (modified) (1 diff)
• utils.c (modified) (6 diffs)

trunk/libtransmission/Makefile.am

@@ -151 +151 @@
         echo '#define USERAGENT_PREFIX      "'@USERAGENT_PREFIX@'"' >> version.h
         echo '#define SVN_REVISION          "'`svn info | grep "Revision" | awk -F': ' '{print $$2}'`'"' >> version.h
+        echo '#define SVN_REVISION_NUM      '`svn info | grep "Revision" | awk -F': ' '{print $$2}'`'' >> version.h
         echo '#define SHORT_VERSION_STRING  "'@USERAGENT_PREFIX@'"' >> version.h
         echo '#define LONG_VERSION_STRING   "'@USERAGENT_PREFIX@' ('`svn info | grep "Revision" | awk -F': ' '{print $$2}'`')"' >> version.h

trunk/libtransmission/fdlimit.c

@@ -490 +490 @@
 
     tr_free( gFd );
+    gFd = NULL;
 }
 

trunk/libtransmission/net.h

@@ -29 +29 @@
  #include <inttypes.h>
  #include <winsock2.h>
-typedef int socklen_t;
-typedef uint16_t tr_port_t;
+ typedef int socklen_t;
+ typedef uint16_t tr_port_t;
 #elif defined( __BEOS__ )
  #include <sys/socket.h>
  #include <netinet/in.h>
-typedef unsigned short tr_port_t;
-typedef int socklen_t;
+ typedef unsigned short tr_port_t;
+ typedef int socklen_t;
 #else
  #include <sys/types.h>
@@ -41 +41 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
-typedef in_port_t tr_port_t;
+ typedef in_port_t tr_port_t;
 #endif
 

trunk/libtransmission/platform.c

@@ -466 +466 @@
                               "Application Support", "Transmission", NULL );
 #elif defined( WIN32 )
-            char appdata[MAX_PATH_LENGTH];
-            SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
-            s = tr_buildPath( appdata, "Transmission", NULL );
+            char configDir[MAX_PATH_LENGTH];
+            GetModuleFileName( GetModuleHandle( NULL ), configDir, sizeof( configDir ) );
+            s = tr_buildPath( basename( configDir ), "Transmission", NULL );
 #else
             if( ( s = getenv( "XDG_CONFIG_HOME" ) ) )
@@ -514 +514 @@
         else
         {
+
 #ifdef SYS_DARWIN
-            CFURLRef     appURL = CFBundleCopyBundleURL(
-                 CFBundleGetMainBundle( ) );
-            CFStringRef  appRef = CFURLCopyFileSystemPath(
-                appURL, kCFURLPOSIXPathStyle );
-            const char * appString = CFStringGetCStringPtr(
-                 appRef, CFStringGetFastestEncoding( appRef ) );
+
+            CFURLRef appURL = CFBundleCopyBundleURL( CFBundleGetMainBundle( ) );
+            CFStringRef appRef = CFURLCopyFileSystemPath( appURL,
+                                                         kCFURLPOSIXPathStyle );
+            const char * appString = CFStringGetCStringPtr( appRef,
+                                         CFStringGetFastestEncoding( appRef ) );
             CFRelease( appURL );
             CFRelease( appRef );
 
             s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
-#elif defined( WIN32 )
-
- #warning hey win32 people is this good or is there a better implementation of the next four lines
-            char appdata[MAX_PATH_LENGTH];
-            SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
-            s = tr_buildPath( appdata, "Transmission", NULL );
-#else
+
+#elif defined( WIN32 )
+
+            /* SHGetFolderPath explicitly requires MAX_PATH length */
+            char dir[MAX_PATH];
+            
+            /* Generally, Web interface should be stored in a Web subdir of
+             * calling executable dir. */
+
+            if( s == NULL ) { 
+                /* First, we should check personal AppData/Transmission/Web */
+                SHGetFolderPath( NULL, CSIDL_COMMON_APPDATA, NULL, 0, dir );
+                s = tr_buildPath( dir, "Transmission", "Web", NULL );
+                if( !isClutchDir( s ) ) {
+                    tr_free( s );
+                    s = NULL;
+                }
+            }
+
+            if( s == NULL ) {
+                /* check personal AppData */
+                SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
+                s = tr_buildPath( dir, "Transmission", "Web", NULL );
+                if( !isClutchDir( s ) ) {
+                    tr_free( s );
+                    s = NULL;
+                }
+            }
+
+            if( s == NULL) {
+                /* check calling module place */
+                GetModuleFileName( GetModuleHandle( NULL ), dir, sizeof( dir ) );
+                s = tr_buildPath( dirname( dir ), "Web", NULL );
+                if( !isClutchDir( s ) ) {
+                    tr_free( s );
+                    s = NULL;
+                }
+            }
+
+#else /* everyone else, follow the XDG spec */
+
             tr_list *candidates = NULL, *l;
 
@@ -574 +609 @@
 
             tr_list_free( &candidates, tr_free );
-#endif
+
+#endif
+
         }
     }

trunk/libtransmission/transmission.h

@@ -63 +63 @@
  *   "$HOME/Library/Application Support/Transmission" is returned.
  * - otherwise, if we're running on WIN32,
- *   "$CSIDL_APPDATA/Transmission" is returned.
+ *   "$EXE_FOLDER/Transmission" is returned.
  * - otherwise, if XDG_CONFIG_HOME is set,
  *   "$XDG_CONFIG_HOME/transmission" is returned.

trunk/libtransmission/utils.c

@@ -56 +56 @@
 static tr_msg_list ** messageQueueTail = &messageQueue;
 
+#ifndef WIN32
+    /* make null versions of these win32 functions */
+    static int IsDebuggerPresent( void ) { return FALSE; }
+    static void OutputDebugString( const void * unused UNUSED ) { }
+#endif
+
 void
 tr_msgInit( void )
@@ -157 +163 @@
 **/
 
+static struct tm *
+tr_localtime_r( time_t *_clock, struct tm *_result )
+{
+#ifdef HAVE_LOCALTIME_R
+    return localtime_r( _clock, _result );
+#else
+    struct tm *p = localtime( _clock );
+    if( p )
+        *(_result) = *p;
+    return p;
+#endif
+}
+
 char*
 tr_getLogTimeStr( char * buf,
@@ -170 +189 @@
     gettimeofday( &tv, NULL );
 
-#ifdef WIN32
-    now_tm = *localtime( &now );
-#else
-    localtime_r( &now, &now_tm );
-#endif
+    tr_localtime_r( &now, &now_tm );
     strftime( tmp, sizeof( tmp ), "%H:%M:%S", &now_tm );
     milliseconds = (int)( tv.tv_usec / 1000 );
@@ -190 +205 @@
 {
     FILE * fp = tr_getLog( );
-#ifdef WIN32
     if( fp || IsDebuggerPresent( ) )
-#else
-    if( fp )
-#endif
     {
         va_list           args;
@@ -209 +220 @@
         va_end( args );
         evbuffer_add_printf( buf, " (%s:%d)\n", base, line );
-#ifdef WIN32
         OutputDebugString( EVBUFFER_DATA( buf ) );
         if(fp)
-#endif
-        (void) fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );
+            (void) fwrite( EVBUFFER_DATA( buf ), 1, EVBUFFER_LENGTH( buf ), fp );
 
         tr_free( base );
@@ -255 +264 @@
         evbuffer_add_vprintf( buf, fmt, ap );
         va_end( ap );
+
+        OutputDebugString( EVBUFFER_DATA( buf ) );
 
         if( EVBUFFER_LENGTH( buf ) )