aboutsummaryrefslogtreecommitdiff
path: root/cyclone/hammer
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 /cyclone/hammer
parentc025f3253dd48185ee556e4ef32cce794be11904 (diff)
merge in Win32 UTF-8 file/path support
svn path=/trunk/externals/miXed/; revision=16950
Diffstat (limited to 'cyclone/hammer')
-rw-r--r--cyclone/hammer/capture.c2
-rw-r--r--cyclone/hammer/coll.c6
-rw-r--r--cyclone/hammer/mtr.c6
-rw-r--r--cyclone/hammer/seq.c4
4 files changed, 6 insertions, 12 deletions
diff --git a/cyclone/hammer/capture.c b/cyclone/hammer/capture.c
index 7598a59..69e44f0 100644
--- a/cyclone/hammer/capture.c
+++ b/cyclone/hammer/capture.c
@@ -137,7 +137,7 @@ static void capture_dowrite(t_capture *x, t_symbol *fn)
int count = x->x_count;
char buf[MAXPDSTRING];
canvas_makefilename(x->x_canvas, fn->s_name, buf, MAXPDSTRING);
- if (fp = fopen(buf, "w")) /* LATER ask if overwriting, CHECKED */
+ if (fp = sys_fopen(buf, "w")) /* LATER ask if overwriting, CHECKED */
{
int col = 0;
if (count < x->x_bufsize)
diff --git a/cyclone/hammer/coll.c b/cyclone/hammer/coll.c
index fc81b30..89112ce 100644
--- a/cyclone/hammer/coll.c
+++ b/cyclone/hammer/coll.c
@@ -601,11 +601,9 @@ static void collcommon_doread(t_collcommon *cc, t_symbol *fn, t_canvas *cv)
/* loading during object creation --
avoid binbuf_read()'s complaints, LATER rethink */
FILE *fp;
- char fname[MAXPDSTRING];
- sys_bashfilename(buf, fname);
- if (!(fp = fopen(fname, "r")))
+ if (!(fp = sys_fopen(buf, "r")))
{
- loud_warning(&coll_class, 0, "no coll file '%s'", fname);
+ loud_warning(&coll_class, 0, "no coll file '%s'", buf);
return;
}
fclose(fp);
diff --git a/cyclone/hammer/mtr.c b/cyclone/hammer/mtr.c
index 15dc5f6..0d04efa 100644
--- a/cyclone/hammer/mtr.c
+++ b/cyclone/hammer/mtr.c
@@ -488,8 +488,7 @@ static void mtr_doread(t_mtr *x, t_mtrack *target, t_symbol *fname)
path[MAXPDSTRING-1] = 0;
}
/* CHECKED no global message */
- sys_bashfilename(path, path);
- if (fp = fopen(path, "r"))
+ if (fp = sys_fopen(path, "r"))
{
t_mtrack *tp = 0;
char linebuf[MTR_FILEBUFSIZE];
@@ -637,8 +636,7 @@ static void mtr_dowrite(t_mtr *x, t_mtrack *source, t_symbol *fname)
path[MAXPDSTRING-1] = 0;
}
/* CHECKED no global message */
- sys_bashfilename(path, path);
- if (fp = fopen(path, "w"))
+ if (fp = sys_fopen(path, "w"))
{
/* CHECKED single-track writing does not seem to work (a bug?) */
if (source) failed = mtr_writetrack(x, source, fp);
diff --git a/cyclone/hammer/seq.c b/cyclone/hammer/seq.c
index ce8c0a4..fd5688d 100644
--- a/cyclone/hammer/seq.c
+++ b/cyclone/hammer/seq.c
@@ -1017,9 +1017,7 @@ static void seq_doread(t_seq *x, t_symbol *fn, int creation)
/* loading during object creation -- CHECKED no warning if a file
specified with an arg does not exist, LATER rethink */
FILE *fp;
- char path[MAXPDSTRING];
- sys_bashfilename(buf, path);
- if (!(fp = fopen(path, "r")))
+ if (!(fp = sys_fopen(buf, "r")))
return;
fclose(fp);
}