From 470c3801b00b9f93099d0e98930e6ec2b29f3fe4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 22 Jan 2013 16:36:53 +0000 Subject: merge in Win32 UTF-8 file/path support svn path=/trunk/externals/pdogg/; revision=16947 --- oggread~.c | 6 +----- oggwrite~.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/oggread~.c b/oggread~.c index d0e7c1d..e0ca7f2 100644 --- a/oggread~.c +++ b/oggread~.c @@ -290,11 +290,7 @@ static void oggread_open(t_oggread *x, t_symbol *filename) post("oggread~: previous file closed"); } /* open file for reading */ -#ifdef WIN32 - if((x->x_file = fopen(filename->s_name, "rb")) < 0) -#else - if((x->x_file = fopen(filename->s_name, "r")) < 0) -#endif + if((x->x_file = sys_fopen(filename->s_name, "r")) < 0) { post("oggread~: could not open file \"%s\"", filename->s_name); x->x_eos = 1; diff --git a/oggwrite~.c b/oggwrite~.c index 2d4c631..5dc0cd4 100644 --- a/oggwrite~.c +++ b/oggwrite~.c @@ -466,11 +466,7 @@ static void oggwrite_open(t_oggwrite *x, t_symbol *sfile) x->x_recflag = 0; } -#ifdef WIN32 - if((x->x_fd = _open( sfile->s_name, x->x_file_open_mode, _S_IREAD|_S_IWRITE)) < 0) -#else - if((x->x_fd = open( sfile->s_name, x->x_file_open_mode, S_IRWXU|S_IRWXG|S_IRWXO )) < 0) -#endif + if((x->x_fd = sys_open( sfile->s_name, x->x_file_open_mode, 0666 )) < 0) { error( "oggwrite~: can not open \"%s\"", sfile->s_name); x->x_fd=-1; -- cgit v1.2.1