SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced use of OS file I/O functions which expect filenames in system codepage with GLib's, since GLib's functions work with UTF-8 and GLib handles converting the filename to system codepage for us.

This commit is contained in:
Arnav Singh 2012-10-22 02:00:21 -07:00
parent 1cc599a0f9
commit 8c7ec909b8
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/dcc.c
View File

@ -57,6 +57,8 @@
#include "url.h" #include "url.h"
#include "xchatc.h" #include "xchatc.h"
#include <glib/gstdio.h>
#ifdef USE_DCC64 #ifdef USE_DCC64
#define BIG_STR_TO_INT(x) strtoull(x,NULL,10) #define BIG_STR_TO_INT(x) strtoull(x,NULL,10)
#ifdef WIN32 #ifdef WIN32
@ -691,12 +693,12 @@ dcc_read (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
if (dcc->resumable) if (dcc->resumable)
{ {
dcc->fp = open (dcc->destfile_fs, O_WRONLY | O_APPEND | OFLAGS); dcc->fp = g_open (dcc->destfile_fs, O_WRONLY | O_APPEND | OFLAGS, 0);
dcc->pos = dcc->resumable; dcc->pos = dcc->resumable;
dcc->ack = dcc->resumable; dcc->ack = dcc->resumable;
} else } else
{ {
if (access (dcc->destfile_fs, F_OK) == 0) if (g_access (dcc->destfile_fs, F_OK) == 0)
{ {
n = 0; n = 0;
do do
@ -717,7 +719,7 @@ dcc_read (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
g_free (old); g_free (old);
} }
dcc->fp = dcc->fp =
open (dcc->destfile_fs, OFLAGS | O_TRUNC | O_WRONLY | O_CREAT, g_open (dcc->destfile_fs, OFLAGS | O_TRUNC | O_WRONLY | O_CREAT,
prefs.hex_dcc_permissions); prefs.hex_dcc_permissions);
} }
} }
@ -1835,7 +1837,7 @@ dcc_send (struct session *sess, char *to, char *file, int maxcps, int passive)
dcc->dccstat = STAT_QUEUED; dcc->dccstat = STAT_QUEUED;
dcc->size = st.st_size; dcc->size = st.st_size;
dcc->type = TYPE_SEND; dcc->type = TYPE_SEND;
dcc->fp = open (file_fs, OFLAGS | O_RDONLY); dcc->fp = g_open (file_fs, OFLAGS | O_RDONLY, 0);
if (dcc->fp != -1) if (dcc->fp != -1)
{ {
g_free (file_fs); g_free (file_fs);
@ -2015,11 +2017,11 @@ is_resumable (struct DCC *dcc)
dcc->resumable = 0; dcc->resumable = 0;
/* Check the file size */ /* Check the file size */
if (access (dcc->destfile_fs, W_OK) == 0) if (g_access (dcc->destfile_fs, W_OK) == 0)
{ {
struct stat st; struct stat st;
if (stat (dcc->destfile_fs, &st) != -1) if (g_stat (dcc->destfile_fs, &st) != -1)
{ {
if (st.st_size < dcc->size) if (st.st_size < dcc->size)
{ {

5
src/common/xchat.h
View File

@ -589,12 +589,7 @@ struct popup
/* CL: get a random int in the range [0..n-1]. DON'T use rand() % n, it gives terrible results. */ /* CL: get a random int in the range [0..n-1]. DON'T use rand() % n, it gives terrible results. */
#define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n))) #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n)))
#ifdef WIN32
#define xchat_filename_from_utf8 g_locale_from_utf8
#define xchat_filename_to_utf8 g_locale_to_utf8
#else
#define xchat_filename_from_utf8 g_filename_from_utf8 #define xchat_filename_from_utf8 g_filename_from_utf8
#define xchat_filename_to_utf8 g_filename_to_utf8 #define xchat_filename_to_utf8 g_filename_to_utf8
#endif
#endif #endif