mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-21 05:36:54 +00:00
Code Issues Releases Wiki Activity

(trunk) more win32 fixes from rb07 in #3311

Browse source
This commit is contained in:
Charles Kerr 2010-06-22 00:12:52 +00:00
parent 3e6705db15
commit 5ad7ed550f
12 changed files with 155 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -407,7 +407,7 @@ case $host_os in
have_msw="yes"
CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"
LIBS="$LIBS -lshell32 -lws2_32"
LIBS="$LIBS -liphlpapi -lshell32 -lws2_32"
transmissionlocaledir="locale"
if test -z "$host_alias"; then
hostaliaswindres=

37
libtransmission/bencode.c
View file

@ -18,9 +18,10 @@
#include <stdlib.h> /* realpath() */
#include <string.h>
#ifdef WIN32
#ifdef WIN32 /* tr_mkstemp() */
#include <fcntl.h>
#define fsync(fd) _commit(fd)
#define _S_IREAD 256
#define _S_IWRITE 128
#endif
#include <sys/types.h> /* stat() */
@ -1633,6 +1634,31 @@ tr_bencToStr( const tr_benc * top, tr_fmt_mode mode, int * len )
return ret;
}
/* portability wrapper for mkstemp(). */
static int
tr_mkstemp( char * template )
{
#ifdef WIN32
const int flags = O_RDWR | O_BINARY | O_CREAT | O_EXCL | _O_SHORT_LIVED;
const mode_t mode = _S_IREAD | _S_IWRITE;
mktemp( template );
return open( template, flags, mode );
#else
return mkstemp( template );
#endif
}
/* portability wrapper for fsync(). */
static void
tr_fsync( int fd )
{
#ifdef WIN32
_commit( fd );
#else
fsync( fd );
#endif
}
int
tr_bencToFile( const tr_benc * top, tr_fmt_mode mode, const char * filename )
{
@ -1642,13 +1668,13 @@ tr_bencToFile( const tr_benc * top, tr_fmt_mode mode, const char * filename )
char buf[TR_PATH_MAX];
/* follow symlinks to find the "real" file, to make sure the temporary
* we build with mkstemp() is created on the right partition */
* we build with tr_mkstemp() is created on the right partition */
if( tr_realpath( filename, buf ) != NULL )
filename = buf;
/* if the file already exists, try to move it out of the way & keep it as a backup */
tmp = tr_strdup_printf( "%s.tmp.XXXXXX", filename );
fd = mkstemp( tmp );
fd = tr_mkstemp( tmp );
if( fd >= 0 )
{
int len;
@ -1657,7 +1683,7 @@ tr_bencToFile( const tr_benc * top, tr_fmt_mode mode, const char * filename )
if( write( fd, str, len ) == (ssize_t)len )
{
fsync( fd );
tr_fsync( fd );
close( fd );
if( !unlink( filename ) || ( errno == ENOENT ) )
@ -1728,3 +1754,4 @@ tr_bencLoadFile( tr_benc * setme, tr_fmt_mode mode, const char * filename )
tr_free( content );
return err;
}

16
libtransmission/blocklist.c
View file

@ -15,6 +15,8 @@
#include <string.h>
#ifdef WIN32
#include <w32api.h>
#define WINVER WindowsXP
#include <windows.h>
#endif
@ -33,6 +35,10 @@
#include "net.h"
#include "utils.h"
#ifndef O_BINARY
#define O_BINARY 0
#endif
/***
**** PRIVATE
@ -80,18 +86,14 @@ blocklistLoad( tr_blocklist * b )
if( stat( b->filename, &st ) == -1 )
return;
fd = open( b->filename, O_RDONLY );
fd = open( b->filename, O_RDONLY | O_BINARY );
if( fd == -1 )
{
tr_err( err_fmt, b->filename, tr_strerror( errno ) );
return;
}
#ifndef WIN32
b->rules = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 );
#else
b->rules = mmap( NULL, st.st_size, 0, 0, fd, 0 );
#endif
if( !b->rules )
{
tr_err( err_fmt, b->filename, tr_strerror( errno ) );
@ -315,7 +317,7 @@ _tr_blocklistSetContent( tr_blocklist * b,
return 0;
}
in = fopen( filename, "r" );
in = fopen( filename, "rb" );
if( !in )
{
tr_err( err_fmt, filename, tr_strerror( errno ) );
@ -362,7 +364,7 @@ _tr_blocklistSetContent( tr_blocklist * b,
{
char * base = tr_basename( b->filename );
tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), base, outCount );
tr_inf( _( "Blocklist \"%s\" updated with %'d entries" ), base, outCount );
tr_free( base );
}

4
libtransmission/net.c
View file

@ -32,8 +32,8 @@
#include <sys/types.h>
#ifdef WIN32
#include <winsock2.h> /* inet_addr */
#include <WS2tcpip.h>
#define _WIN32_WINNT 0x0501
#include <ws2tcpip.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>

5
libtransmission/net.h
View file

@ -31,9 +31,7 @@
#ifdef WIN32
#include <inttypes.h>
#include <winsock2.h>
#include <WS2tcpip.h>
typedef int socklen_t;
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <sys/socket.h>
@ -42,6 +40,7 @@
#endif
#ifdef WIN32
#define EADDRINUSE WSAEADDRINUSE
#define ECONNREFUSED WSAECONNREFUSED
#define ECONNRESET WSAECONNRESET
#define EHOSTUNREACH WSAEHOSTUNREACH

21
libtransmission/torrent.c
View file

@ -1658,6 +1658,15 @@ tr_torrentClearRatioLimitHitCallback( tr_torrent * torrent )
tr_torrentSetRatioLimitHitCallback( torrent, NULL, NULL );
}
static void
tr_setenv( const char * name, const char * value, tr_bool override )
{
#ifdef WIN32
putenv( tr_strdup_printf( "%s=%s", name, value ) ); /* leaks memory... */
#else
setenv( name, value, override );
#endif
}
static void
torrentCallScript( tr_torrent * tor, const char * script )
@ -1673,16 +1682,16 @@ torrentCallScript( tr_torrent * tor, const char * script )
clearenv( );
#endif
setenv( "TR_APP_VERSION", SHORT_VERSION_STRING, 1 );
tr_setenv( "TR_APP_VERSION", SHORT_VERSION_STRING, 1 );
tr_snprintf( buf, sizeof( buf ), "%d", tr_torrentId( tor ) );
setenv( "TR_TORRENT_ID", buf, 1 );
setenv( "TR_TORRENT_NAME", tr_torrentName( tor ), 1 );
setenv( "TR_TORRENT_DIR", tor->currentDir, 1 );
setenv( "TR_TORRENT_HASH", tor->info.hashString, 1 );
tr_setenv( "TR_TORRENT_ID", buf, 1 );
tr_setenv( "TR_TORRENT_NAME", tr_torrentName( tor ), 1 );
tr_setenv( "TR_TORRENT_DIR", tor->currentDir, 1 );
tr_setenv( "TR_TORRENT_HASH", tor->info.hashString, 1 );
tr_strlcpy( buf, ctime( &now ), sizeof( buf ) );
*strchr( buf,'\n' ) = '\0';
setenv( "TR_TIME_LOCALTIME", buf, 1 );
tr_setenv( "TR_TIME_LOCALTIME", buf, 1 );
tr_torinf( tor, "Calling script \"%s\"", script );
system( script );
}

14
libtransmission/tr-dht.c
View file

@ -25,13 +25,19 @@ THE SOFTWARE.
#include <stdio.h>
/* posix */
#include <netinet/in.h> /* sockaddr_in */
#include <signal.h> /* sig_atomic_t */
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h> /* socket(), bind() */
#include <netdb.h>
#include <unistd.h> /* close() */
#ifdef WIN32
#include <inttypes.h>
#define _WIN32_WINNT 0x0501 /* freeaddrinfo(),getaddrinfo(),getnameinfo() */
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <sys/socket.h> /* socket(), bind() */
#include <netdb.h>
#include <netinet/in.h> /* sockaddr_in */
#endif
/* third party */
#include <event.h>

134
libtransmission/trevent.c
View file

@ -26,79 +26,95 @@
#ifdef WIN32
#include <WinSock2.h>
#include "utils.h"
#include <winsock2.h>
static int
pgpipe( int handles[2] )
{
SOCKET s;
struct sockaddr_in serv_addr;
int len = sizeof( serv_addr );
SOCKET s;
struct sockaddr_in serv_addr;
int len = sizeof( serv_addr );
handles[0] = handles[1] = INVALID_SOCKET;
handles[0] = handles[1] = INVALID_SOCKET;
if ( ( s = socket( AF_INET, SOCK_STREAM, 0 ) ) == INVALID_SOCKET )
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to create socket: %ui", WSAGetLastError()))); */
return -1;
}
if ( ( s = socket( AF_INET, SOCK_STREAM, 0 ) ) == INVALID_SOCKET )
{
tr_dbg("pgpipe failed to create socket: %ui", WSAGetLastError());
return -1;
}
memset( &serv_addr, 0, sizeof( serv_addr ) );
serv_addr.sin_family = AF_INET;
serv_addr.sin_port = htons(0);
serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
if (bind(s, (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError()))); */
closesocket(s);
return -1;
}
if (listen(s, 1) == SOCKET_ERROR)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to listen: %ui", WSAGetLastError()))); */
closesocket(s);
return -1;
}
if (getsockname(s, (SOCKADDR *) & serv_addr, &len) == SOCKET_ERROR)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError()))); */
closesocket(s);
return -1;
}
if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to create socket 2: %ui", WSAGetLastError()))); */
closesocket(s);
return -1;
}
if (connect(handles[1], (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError()))); */
closesocket(s);
return -1;
}
if ((handles[0] = accept(s, (SOCKADDR *) & serv_addr, &len)) == INVALID_SOCKET)
{
/* ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError()))); */
closesocket(handles[1]);
handles[1] = INVALID_SOCKET;
closesocket(s);
return -1;
}
memset( &serv_addr, 0, sizeof( serv_addr ) );
serv_addr.sin_family = AF_INET;
serv_addr.sin_port = htons(0);
serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
if (bind(s, (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR)
{
tr_dbg("pgpipe failed to bind: %ui", WSAGetLastError());
closesocket(s);
return 0;
return -1;
}
if (listen(s, 1) == SOCKET_ERROR)
{
tr_ndbg("event","pgpipe failed to listen: %ui", WSAGetLastError());
closesocket(s);
return -1;
}
if (getsockname(s, (SOCKADDR *) & serv_addr, &len) == SOCKET_ERROR)
{
tr_dbg("pgpipe failed to getsockname: %ui", WSAGetLastError());
closesocket(s);
return -1;
}
if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
{
tr_dbg("pgpipe failed to create socket 2: %ui", WSAGetLastError());
closesocket(s);
return -1;
}
if (connect(handles[1], (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR)
{
tr_dbg("pgpipe failed to connect socket: %ui", WSAGetLastError());
closesocket(s);
return -1;
}
if ((handles[0] = accept(s, (SOCKADDR *) & serv_addr, &len)) == INVALID_SOCKET)
{
tr_dbg("pgpipe failed to accept socket: %ui", WSAGetLastError());
closesocket(handles[1]);
handles[1] = INVALID_SOCKET;
closesocket(s);
return -1;
}
closesocket(s);
return 0;
}
static int
piperead( int s, char *buf, int len )
{
int ret = recv(s, buf, len, 0);
int ret = recv(s, buf, len, 0);
int werror = 0;
if (ret < 0 && WSAGetLastError() == WSAECONNRESET)
/* EOF on the pipe! (win32 socket based implementation) */
ret = 0;
return ret;
if (ret < 0) {
werror= WSAGetLastError();
switch(werror) {
/* simplified error mapping (not valid for connect) */
case WSAEWOULDBLOCK:
errno = EAGAIN;
break;
case WSAECONNRESET:
/* EOF on the pipe! (win32 socket based implementation) */
ret = 0;
/* fall through */
default:
errno = werror;
break;
}
} else
errno = 0;
return ret;
}
#define pipe(a) pgpipe(a)

BIN
qt/qtr.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

8
qt/qtr.pro
View file

@ -9,7 +9,7 @@ INSTALLS += target
CONFIG += qt qdbus thread debug link_pkgconfig
QT += network
PKGCONFIG = fontconfig libcurl openssl
PKGCONFIG = fontconfig libcurl openssl dbus-1
TRANSMISSION_TOP = ..
INCLUDEPATH += $${TRANSMISSION_TOP}
@ -17,7 +17,10 @@ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
LIBS += -levent
unix: LIBS += -levent
win32:DEFINES += QT_DBUS
win32:LIBS += -levent -lws2_32 -lintl
win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
TRANSLATIONS += transmission_en.ts transmission_ru.ts
@ -32,3 +35,4 @@ SOURCES += about.cc app.cc dbus-adaptor.cc details.cc file-tree.cc filters.cc \
HEADERS += $$replace(SOURCES, .cc, .h)
HEADERS += speed.h types.h
win32:RC_FILE = qtr.rc

1
qt/qtr.rc Normal file
View file

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "qtr.ico"

4
qt/utils.cc
View file

@ -76,12 +76,12 @@ Utils :: sizeToString( double size )
else if( size < (int64_t)GIGABYTE_FACTOR )
{
displayed_size = (double)size / MEGABYTE_FACTOR;
str = tr( "%L1 MiB" ).arg( displayed_size, 0, 'f', 1 );
str = tr( "%L1 MiB" ).arg( displayed_size, 0, 'f', 2 );
}
else
{
displayed_size = (double) size / GIGABYTE_FACTOR;
str = tr( "%L1 GiB" ).arg( displayed_size, 0, 'f', 1 );
str = tr( "%L1 GiB" ).arg( displayed_size, 0, 'f', 3 );
}
}