aboutsummaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-01-22 16:46:29 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2013-01-22 16:46:29 +0000
commiteae942b7b4ed36f5f43edd20ae6abd9e923b96c0 (patch)
tree1b265676adc167d6f30f80ca98e56d37b182b806 /shared
parentc025f3253dd48185ee556e4ef32cce794be11904 (diff)
merge in Win32 UTF-8 file/path support
svn path=/trunk/externals/miXed/; revision=16950
Diffstat (limited to 'shared')
-rw-r--r--shared/common/mifi.c6
-rw-r--r--shared/common/os.c6
-rw-r--r--shared/common/port.c2
3 files changed, 5 insertions, 9 deletions
diff --git a/shared/common/mifi.c b/shared/common/mifi.c
index c0a7178..4da9f55 100644
--- a/shared/common/mifi.c
+++ b/shared/common/mifi.c
@@ -545,8 +545,7 @@ static int mifiread_startfile(t_mifiread *mr, const char *filename,
if (fnameptr != slashpos)
strcpy(slashpos, fnameptr);
}
- sys_bashfilename(path, path);
- if (!(mr->mr_fp = fopen(path, "rb")))
+ if (!(mr->mr_fp = sys_fopen(path, "rb")))
{
strcpy(errmess, "cannot open");
goto rstartfailed;
@@ -1328,8 +1327,7 @@ int mifiwrite_open(t_mifiwrite *mw, const char *filename,
if (*dirname)
strcat(fnamebuf, dirname), strcat(fnamebuf, "/");
strcat(fnamebuf, filename);
- sys_bashfilename(fnamebuf, fnamebuf);
- if (!(mw->mw_fp = fopen(fnamebuf, "wb")))
+ if (!(mw->mw_fp = sys_fopen(fnamebuf, "wb")))
{
strcpy(errmess, "cannot open");
goto wopenfailed;
diff --git a/shared/common/os.c b/shared/common/os.c
index 408fdfb..9737949 100644
--- a/shared/common/os.c
+++ b/shared/common/os.c
@@ -216,8 +216,7 @@ FILE *fileread_open(char *filename, t_canvas *cv, int textmode)
if (nameptr != slashpos)
strcpy(slashpos, nameptr);
}
- sys_bashfilename(path, path);
- return (fopen(path, (textmode ? "r" : "rb")));
+ return (sys_fopen(path, (textmode ? "r" : "rb")));
}
FILE *filewrite_open(char *filename, t_canvas *cv, int textmode)
@@ -231,8 +230,7 @@ FILE *filewrite_open(char *filename, t_canvas *cv, int textmode)
strncpy(path, filename, MAXPDSTRING);
path[MAXPDSTRING-1] = 0;
}
- sys_bashfilename(path, path);
- return (fopen(path, (textmode ? "w" : "wb")));
+ return (sys_fopen(path, (textmode ? "w" : "wb")));
}
/* FIXME add MSW */
diff --git a/shared/common/port.c b/shared/common/port.c
index fe58b6e..bcfddf3 100644
--- a/shared/common/port.c
+++ b/shared/common/port.c
@@ -953,7 +953,7 @@ static int imaction_K1_replace(t_port *x, char *arg)
sprintf(buf, "port-%02d.pict", ++x->x_pictno);
if (x->x_dumping)
{
- if (x->x_pictfp = fopen(buf, "wb"))
+ if (x->x_pictfp = sys_fopen(buf, "wb"))
{
int i;
for (i = 0; i < 512; i++) fputc(0, x->x_pictfp);