From eae942b7b4ed36f5f43edd20ae6abd9e923b96c0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Tue, 22 Jan 2013 16:46:29 +0000
Subject: merge in Win32 UTF-8 file/path support

svn path=/trunk/externals/miXed/; revision=16950
---
 cyclone/Makefile.libdir  | 2 +-
 cyclone/hammer/capture.c | 2 +-
 cyclone/hammer/coll.c    | 6 ++----
 cyclone/hammer/mtr.c     | 6 ++----
 cyclone/hammer/seq.c     | 4 +---
 cyclone/sickle/capture.c | 2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'cyclone')

diff --git a/cyclone/Makefile.libdir b/cyclone/Makefile.libdir
index eacff54..920c080 100644
--- a/cyclone/Makefile.libdir
+++ b/cyclone/Makefile.libdir
@@ -113,7 +113,7 @@ endif
 
 cyclone:
 	$(MAKE) -f Makefile \
-		OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -fPIC"
+		OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -Wstrict-aliasing=2 -fPIC"
 
 install: cyclone
 	$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/cyclone
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);
     }
diff --git a/cyclone/sickle/capture.c b/cyclone/sickle/capture.c
index 8f8f5a0..a613694 100644
--- a/cyclone/sickle/capture.c
+++ b/cyclone/sickle/capture.c
@@ -75,7 +75,7 @@ static void capture_dowrite(t_capture *x, t_symbol *fn)
     char buf[MAXPDSTRING];
     canvas_makefilename(glist_getcanvas(x->x_glist),
 			fn->s_name, buf, MAXPDSTRING);
-    if (fp = fopen(buf, "w"))  /* LATER ask if overwriting, CHECKME */
+    if (fp = sys_fopen(buf, "w"))  /* LATER ask if overwriting, CHECKME */
     {
 	int col = 0;
 	if (x->x_mode == 'f' || count < x->x_bufsize)
-- 
cgit v1.2.1