Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 18:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

(trunk, libt) #4160 - the slow slog to catch trunk up to mike.dld's 4160 diff continues. This step applies 4160-03b-file.patch, which replaces native file operations with the tr_sys_file_*() portability wrappers added in r14321.

Browse Source
This commit is contained in:
Jordan Lee
2014-07-28 04:13:38 +00:00
parent 2c0276fc23
commit b33a7d4dc1
15 changed files with 229 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libtransmission/rpcimpl.c
View File

@@ -19,6 +19,7 @@
#include "transmission.h"
#include "completion.h"
#include "error.h"
#include "fdlimit.h"
#include "file.h"
#include "log.h"
@@ -1487,13 +1488,14 @@ gotNewBlocklist (tr_session * session,
}
else /* successfully fetched the blocklist... */
{
int fd;
tr_sys_file_t fd;
int err;
char * filename;
z_stream stream;
const char * configDir = tr_sessionGetConfigDir (session);
const size_t buflen = 1024 * 128; /* 128 KiB buffer */
uint8_t * buf = tr_valloc (buflen);
tr_error * error = NULL;
/* this is an odd Magic Number required by zlib to enable gz support.
See zlib's inflateInit2 () documentation for a full description */
@@ -1506,10 +1508,13 @@ gotNewBlocklist (tr_session * session,
stream.avail_in = response_byte_count;
inflateInit2 (&stream, windowBits);
filename = tr_buildPath (configDir, "blocklist.tmp", NULL);
fd = tr_open_file_for_writing (filename);
if (fd < 0)
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
filename = tr_buildPath (configDir, "blocklist.tmp.XXXXXX", NULL);
fd = tr_sys_file_open_temp (filename, &error);
if (fd == TR_BAD_SYS_FILE)
{
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, error->message);
tr_error_clear (&error);
}
for (;;)
{
@@ -1519,10 +1524,10 @@ gotNewBlocklist (tr_session * session,
if (stream.avail_out < buflen)
{
const int e = write (fd, buf, buflen - stream.avail_out);
if (e < 0)
if (!tr_sys_file_write (fd, buf, buflen - stream.avail_out, NULL, &error))
{
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, error->message);
tr_error_clear (&error);
break;
}
}
@@ -1538,10 +1543,13 @@ gotNewBlocklist (tr_session * session,
inflateEnd (&stream);
if (err == Z_DATA_ERROR) /* couldn't inflate it... it's probably already uncompressed */
if (write (fd, response, response_byte_count) < 0)
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, tr_strerror (errno));
if (!tr_sys_file_write (fd, response, response_byte_count, NULL, &error))
{
tr_snprintf (result, sizeof (result), _("Couldn't save file \"%1$s\": %2$s"), filename, error->message);
tr_error_clear (&error);
}
tr_close_file(fd);
tr_sys_file_close (fd, NULL);
if (*result)
{