From f1bc081d8ebae0bfbb45f6851172b04a2cf89af3 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Sun, 8 Mar 2020 23:53:40 -0400
Subject: [PATCH] use sys_open and friends in most of the libs in
purr-data/externals
---
externals/creb/modules/bmatrix~.c | 2 +-
externals/cxc/ascwave.c | 2 +-
externals/earplug~/earplug~.c | 2 +-
externals/ext13/sfread.c | 4 ++--
externals/ext13/sfwrite13~.c | 4 ++--
externals/ggee/gui/.image.c.swp | Bin 16384 -> 0 bytes
externals/ggee/gui/image.c | 4 ++--
externals/ggee/gui/state.c | 4 ++--
externals/ggee/other/vbap.c | 4 ++--
externals/ggee/signal/sfwrite~.c | 4 ++--
externals/grh/adaptive/src/adaptive.c | 6 +++---
externals/iem/iemgui/src/iem_image.c | 6 +++---
externals/iemlib/iem_mp3/src/mp3play~.c | 8 +++----
externals/iemlib/iemlib1/src/soundfile_info.c | 8 +++----
externals/iemlib/iemlib2/src/iem_pbank_csv.c | 8 +++----
externals/lyonpotpourri/sigseq~.c | 4 ++--
externals/moonlib/image.c | 2 +-
externals/moonlib/readsfv~.c | 20 +++++++++---------
externals/moonlib/sfread2~.c | 2 +-
externals/tb/sndfiler/src/file_input.c | 8 +++----
20 files changed, 51 insertions(+), 51 deletions(-)
delete mode 100644 externals/ggee/gui/.image.c.swp
diff --git a/externals/creb/modules/bmatrix~.c b/externals/creb/modules/bmatrix~.c
index 05c726889..90676b448 100644
--- a/externals/creb/modules/bmatrix~.c
+++ b/externals/creb/modules/bmatrix~.c
@@ -49,7 +49,7 @@ static void matrix_load(t_matrix *x, t_symbol *s)
if(s && s->s_name)
{
post("matrix: loading %s",s->s_name);
- if(matrix = fopen(s->s_name, "r"))
+ if(matrix = sys_fopen(s->s_name, "r"))
{
int n = x->x_ctl.c_order;
fread(x->x_ctl.c_A, sizeof(t_float), n*n, matrix);
diff --git a/externals/cxc/ascwave.c b/externals/cxc/ascwave.c
index 22f85b852..4c9978a77 100644
--- a/externals/cxc/ascwave.c
+++ b/externals/cxc/ascwave.c
@@ -49,7 +49,7 @@ static void ascwave_open(t_ascwave *x, t_symbol *filename)
post("ascwave: open");
x->filename = filename;
post("ascwave: filename = %s",x->filename->s_name);
- if ((x->x_file = fopen(x->filename->s_name,"w")) < 0)
+ if ((x->x_file = sys_fopen(x->filename->s_name,"w")) < 0)
{
error("can't create %s",filename->s_name);
return;
diff --git a/externals/earplug~/earplug~.c b/externals/earplug~/earplug~.c
index c53d3207a..a72d6dd5c 100644
--- a/externals/earplug~/earplug~.c
+++ b/externals/earplug~/earplug~.c
@@ -200,7 +200,7 @@ static void *earplug_new(t_floatarg azimArg, t_floatarg elevArg)
fscanf(fp, "%f %f ", &earplug_impulses[i][0][j], &earplug_impulses[i][1][j]);
}
}
- fclose(fp) ;
+ sys_fclose(fp) ;
}
x->impulses = earplug_impulses;
diff --git a/externals/ext13/sfread.c b/externals/ext13/sfread.c
index 9d990a47b..caa467297 100644
--- a/externals/ext13/sfread.c
+++ b/externals/ext13/sfread.c
@@ -52,9 +52,9 @@ void sfread_open(t_sfread *x,t_symbol *filename)
/* close the old file */
if (x->x_mapaddr) munmap(x->x_mapaddr,x->x_size);
- if (x->x_fd >= 0) close(x->x_fd);
+ if (x->x_fd >= 0) sys_close(x->x_fd);
- if ((x->x_fd = open(fname,O_RDONLY)) < 0)
+ if ((x->x_fd = sys_open(fname,O_RDONLY)) < 0)
{
error("can't open %s",fname);
return;
diff --git a/externals/ext13/sfwrite13~.c b/externals/ext13/sfwrite13~.c
index ecf4532dd..f35916c37 100644
--- a/externals/ext13/sfwrite13~.c
+++ b/externals/ext13/sfwrite13~.c
@@ -140,7 +140,7 @@ static void sfwrite13_close(t_sfwrite13 *x)
sfwrite13_wave_setup(x,&w);
lseek(x->x_file,0,SEEK_SET);
write(x->x_file,&w,sizeof(w));
- close(x->x_file);
+ sys_close(x->x_file);
}
x->x_file = -1;
}
@@ -164,7 +164,7 @@ static void sfwrite13_open(t_sfwrite13 *x,t_symbol *filename)
sfwrite13_close(x);
- if ((x->x_file = open(fname,OPENPARAMS,0664)) < 0)
+ if ((x->x_file = sys_open(fname,OPENPARAMS,0664)) < 0)
{
error("can't create %s",fname);
return;
diff --git a/externals/ggee/gui/.image.c.swp b/externals/ggee/gui/.image.c.swp
deleted file mode 100644
index a7e8f8fc4ce7668ff2b1f77e2e96e7a06db183d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 16384
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
Uj_H(U!_(2ClV5n6gpHQ`Z-%k)y#N3J
diff --git a/externals/ggee/gui/image.c b/externals/ggee/gui/image.c
index 67795a133..ae501c432 100644
--- a/externals/ggee/gui/image.c
+++ b/externals/ggee/gui/image.c
@@ -45,9 +45,9 @@ t_symbol *image_trytoopen(t_image* x)
canvas_makefilename(glist_getcanvas(x->x_glist), x->x_fname->s_name,
fname, FILENAME_MAX);
// try to open the file
- if (file = fopen(fname, "r"))
+ if (file = sys_fopen(fname, "r"))
{
- fclose(file);
+ sys_fclose(file);
return gensym(fname);
}
else
diff --git a/externals/ggee/gui/state.c b/externals/ggee/gui/state.c
index 063b15f10..dd6cad366 100644
--- a/externals/ggee/gui/state.c
+++ b/externals/ggee/gui/state.c
@@ -90,7 +90,7 @@ void state_dosave(t_state *x)
else
sprintf(name,"%s%s.%d",dirstr,x->x_name->s_name,x->x_slot);
- fp = fopen(name,"w");
+ fp = sys_fopen(name,"w");
if (!fp) {
post("state: unable to open %s",name);
return;
@@ -151,7 +151,7 @@ void state_dosave(t_state *x)
} while ((a = (t_text*)((t_gobj*)a)->g_next));
post("state saved to: %s",name);
- fclose(fp);
+ sys_fclose(fp);
}
diff --git a/externals/ggee/other/vbap.c b/externals/ggee/other/vbap.c
index 57dae7b8e..cf3b4d90e 100644
--- a/externals/ggee/other/vbap.c
+++ b/externals/ggee/other/vbap.c
@@ -122,7 +122,7 @@ static void *vbap_new(t_symbol* s)
canvas_makefilename(canvas_getcurrent(),s->s_name,
fname,MAXPDSTRING);
- if((fp=fopen(fname,"r"))==NULL){
+ if((fp=sys_fopen(fname,"r"))==NULL){
post("vbap: Could not open loudspeaker data file %s\n",fname);
x->opened = 0;
}
@@ -130,7 +130,7 @@ static void *vbap_new(t_symbol* s)
if (!read_ls_conf(x,fp))
return NULL;
x->opened = 1;
- fclose(fp);
+ sys_fclose(fp);
}
x->lasttrip[0] = 0;
diff --git a/externals/ggee/signal/sfwrite~.c b/externals/ggee/signal/sfwrite~.c
index 1209572c5..706094c4b 100644
--- a/externals/ggee/signal/sfwrite~.c
+++ b/externals/ggee/signal/sfwrite~.c
@@ -99,7 +99,7 @@ static void sfwrite_close(t_sfwrite *x)
sfwrite_wave_setup(x,&w);
lseek(x->x_file,0,SEEK_SET);
write(x->x_file,&w,sizeof(w));
- close(x->x_file);
+ sys_close(x->x_file);
}
x->x_file = -1;
}
@@ -123,7 +123,7 @@ static void sfwrite_open(t_sfwrite *x,t_symbol *filename)
sfwrite_close(x);
- if ((x->x_file = open(fname,OPENPARAMS,0664)) < 0)
+ if ((x->x_file = sys_open(fname,OPENPARAMS,0664)) < 0)
{
error("can't create %s",fname);
return;
diff --git a/externals/grh/adaptive/src/adaptive.c b/externals/grh/adaptive/src/adaptive.c
index 5c3b6515f..02aae8b74 100644
--- a/externals/grh/adaptive/src/adaptive.c
+++ b/externals/grh/adaptive/src/adaptive.c
@@ -79,7 +79,7 @@ void adaptation_write(const char *filename, t_int N, t_float mu, t_float *c)
int i;
// open file
- f = fopen(filename, "w");
+ f = sys_fopen(filename, "w");
if(!f)
{
post("adaptive, save: error open file");
@@ -96,7 +96,7 @@ void adaptation_write(const char *filename, t_int N, t_float mu, t_float *c)
fprintf(f, "%.30f\n", c[i]);
// close file
- if (f) fclose(f);
+ if (f) sys_fclose(f);
post("adaptive, save: coefficients written to file");
}
@@ -107,7 +107,7 @@ void adaptation_read(const char *filename, t_int *N, t_float *mu,
int i, n=0;
// open file
- f = fopen(filename, "r");
+ f = sys_fopen(filename, "r");
if(!f)
{
post("adaptive, open: error open file");
diff --git a/externals/iem/iemgui/src/iem_image.c b/externals/iem/iemgui/src/iem_image.c
index 52f8c6115..faec94671 100644
--- a/externals/iem/iemgui/src/iem_image.c
+++ b/externals/iem/iemgui/src/iem_image.c
@@ -57,11 +57,11 @@ static t_symbol *iem_image_calc_size(t_iem_image *x)
else
{
if(fd >= 0)
- close(fd);
+ sys_close(fd);
strcpy(namebuf, dirbuf);
strcat(namebuf, "/");
strcat(namebuf, namebufptr);
- fh = fopen(namebuf, "r");
+ fh = sys_fopen(namebuf, "r");
if(fh == NULL)
{
post("iem_image-ERROR: cannot open %s second time", namebuf);
@@ -76,7 +76,7 @@ static t_symbol *iem_image_calc_size(t_iem_image *x)
x->x_gifsym = (t_symbol *)0;
return((t_symbol *)0);
};
- fclose(fh);
+ sys_fclose(fh);
c = (char *)buf;
if((c[0] != 'G')||(c[1] != 'I')||(c[2] != 'F'))
{
diff --git a/externals/iemlib/iem_mp3/src/mp3play~.c b/externals/iemlib/iem_mp3/src/mp3play~.c
index d4c342a44..bab4089c0 100644
--- a/externals/iemlib/iem_mp3/src/mp3play~.c
+++ b/externals/iemlib/iem_mp3/src/mp3play~.c
@@ -3174,7 +3174,7 @@ static void *mp3play_tilde_new(void)
static void mp3play_tilde_cleanup(t_mp3play_tilde *x)
{
x->file_is_open = 0;
- fclose(x->fh);
+ sys_fclose(x->fh);
x->play_state = 0;
x->mp3_out_index = 0;
x->mp_is_init = 0;
@@ -3404,7 +3404,7 @@ static void mp3play_tilde_do_open(t_mp3play_tilde *x, char *str, int calc_it)
strcat(completefilename, str);
}
- if((x->fh = fopen(completefilename, "rb")) == NULL)
+ if((x->fh = sys_fopen(completefilename, "rb")) == NULL)
{
post("mp3play-ERROR: cannot open %s", completefilename);
}
@@ -3520,13 +3520,13 @@ static void mp3play_tilde_do_open(t_mp3play_tilde *x, char *str, int calc_it)
{
x->file_is_open = 0;
x->mp3_out_index = 0;
- fclose(x->fh);
+ sys_fclose(x->fh);
}
}
else
{
x->file_is_open = 0;
- fclose(x->fh);
+ sys_fclose(x->fh);
}
}
x->play_state = 2;
diff --git a/externals/iemlib/iemlib1/src/soundfile_info.c b/externals/iemlib/iemlib1/src/soundfile_info.c
index f018370a6..aa49cf5a4 100644
--- a/externals/iemlib/iemlib1/src/soundfile_info.c
+++ b/externals/iemlib/iemlib1/src/soundfile_info.c
@@ -99,7 +99,7 @@ static void soundfile_info_overwrite_sr(t_soundfile_info *x, t_symbol *filename,
strcat(completefilename, filename->s_name);
}
- fh = fopen(completefilename,"r+b");
+ fh = sys_fopen(completefilename,"r+b");
if(!fh)
{
post("soundfile_info_read: cannot open %s !!\n", completefilename);
@@ -187,7 +187,7 @@ static void soundfile_info_overwrite_sr(t_soundfile_info *x, t_symbol *filename,
fseek(fh,0,SEEK_SET);
read_chars = (int)fwrite (x->x_begmem, sizeof(char), n4, fh);
- fclose(fh);
+ sys_fclose(fh);
post("written");
sr = (int)ul_sr;
@@ -268,7 +268,7 @@ static void soundfile_info_read(t_soundfile_info *x, t_symbol *filename)
strcat(completefilename, filename->s_name);
}
- fh = fopen(completefilename,"rb");
+ fh = sys_fopen(completefilename,"rb");
if(!fh)
{
post("soundfile_info_read: cannot open %s !!\n", completefilename);
@@ -282,7 +282,7 @@ static void soundfile_info_read(t_soundfile_info *x, t_symbol *filename)
filesize = ftell(fh);
fseek(fh,0,SEEK_SET);
read_chars = (int)fread(x->x_begmem, sizeof(char), n4, fh) / 2;
- fclose(fh);
+ sys_fclose(fh);
// post("read chars = %d", read_chars);
cvec = (char *)x->x_begmem;
if(read_chars > 4)
diff --git a/externals/iemlib/iemlib2/src/iem_pbank_csv.c b/externals/iemlib/iemlib2/src/iem_pbank_csv.c
index cb919a932..d24b055cd 100644
--- a/externals/iemlib/iemlib2/src/iem_pbank_csv.c
+++ b/externals/iemlib/iemlib2/src/iem_pbank_csv.c
@@ -88,7 +88,7 @@ static void iem_pbank_csv_write(t_iem_pbank_csv *x, t_symbol *filename, t_symbol
strcat(completefilename, filename->s_name);
}
- fh = fopen(completefilename,"wb");
+ fh = sys_fopen(completefilename,"wb");
if(!fh)
{
post("iem_pbank_csv_write: cannot create %s !!\n", completefilename);
@@ -172,7 +172,7 @@ static void iem_pbank_csv_write(t_iem_pbank_csv *x, t_symbol *filename, t_symbol
fprintf(fh, "%s%s", ap->a_w.w_symbol->s_name, eol+eol_offset);
ap++;
}
- fclose(fh);
+ sys_fclose(fh);
post("iem_pbank_csv: wrote %d parameters x %d lines to file:\n%s\nwith following format:\n%s\n", nrp, nrl, completefilename, formattext);
}
}
@@ -407,7 +407,7 @@ static void iem_pbank_csv_read(t_iem_pbank_csv *x, t_symbol *filename, t_symbol
strcat(completefilename, filename->s_name);
}
- fh = fopen(completefilename,"rb");
+ fh = sys_fopen(completefilename,"rb");
if(!fh)
{
post("iem_pbank_csv_read: cannot open %s !!\n", completefilename);
@@ -481,7 +481,7 @@ static void iem_pbank_csv_read(t_iem_pbank_csv *x, t_symbol *filename, t_symbol
txbuf2 = (char *)getbytes((2 * txalloc + 256) * sizeof(char));
if(fread(txbuf1, sizeof(char), txalloc, fh) < sizeof(char)*txalloc)
post("pbank.csv:435: warning read error (not specified)");
- fclose(fh);
+ sys_fclose(fh);
// 1.) allow only readable ASCII (0x09, 0x0a, 0x0d, 0x20...0x7e =
// = TAB, LF, CR, ' ' ... '~' =
diff --git a/externals/lyonpotpourri/sigseq~.c b/externals/lyonpotpourri/sigseq~.c
index 7282b65fb..8cffb3f26 100755
--- a/externals/lyonpotpourri/sigseq~.c
+++ b/externals/lyonpotpourri/sigseq~.c
@@ -141,7 +141,7 @@ void sigseq_readfile(t_sigseq *x, t_symbol *filename)
FILE *fp;
float data;
post("requested path: %s", filename->s_name);
- fp = fopen(filename->s_name, "r");
+ fp = sys_fopen(filename->s_name, "r");
if( fp == NULL ){
post("could not open file!");
return;
@@ -149,7 +149,7 @@ void sigseq_readfile(t_sigseq *x, t_symbol *filename)
while( fscanf(fp, "%f", &data) != EOF ){
post("%f",data);
}
- fclose(fp);
+ sys_fclose(fp);
}
void sigseq_mute(t_sigseq *x, t_symbol *msg, short argc, t_atom *argv)
diff --git a/externals/moonlib/image.c b/externals/moonlib/image.c
index f8a1fe2e0..0146cdf9b 100644
--- a/externals/moonlib/image.c
+++ b/externals/moonlib/image.c
@@ -43,7 +43,7 @@ static const char *image_get_filename(t_image *x, char *file)
retrieve the full path... */
fullpath = dirresult;
fullpath[strlen(fullpath)] = '/';
- close(fd);
+ sys_close(fd);
return fullpath;
}
else return 0;
diff --git a/externals/moonlib/readsfv~.c b/externals/moonlib/readsfv~.c
index 1c2cb5291..ec2c23156 100644
--- a/externals/moonlib/readsfv~.c
+++ b/externals/moonlib/readsfv~.c
@@ -523,12 +523,12 @@ static int create_soundfile2(t_canvas *canvas, const char *filename,
canvas_makefilename(canvas, filenamebuf, buf2, MAXPDSTRING);
sys_bashfilename(buf2, buf2);
- if ((fd = open(buf2, BINCREATE, 0666)) < 0)
+ if ((fd = sys_open(buf2, BINCREATE, 0666)) < 0)
return (-1);
if (write(fd, headerbuf, headersize) < headersize)
{
- close (fd);
+ sys_close (fd);
return (-1);
}
return (fd);
@@ -914,7 +914,7 @@ static void soundfiler2_read(t_soundfiler2 *x, t_symbol *s,
/* do all graphics updates */
for (i = 0; i < argc; i++)
garray_redraw(garrays[i]);
- fclose(fp);
+ sys_fclose(fp);
fd = -1;
goto done;
usage:
@@ -923,7 +923,7 @@ usage:
post("-raw <headerbytes> <channels> <bytespersamp> <endian (b, l, or n)>.");
done:
if (fd >= 0)
- close (fd);
+ sys_close (fd);
outlet_float(x->x_obj.ob_outlet, (float)itemsread);
}
@@ -1029,7 +1029,7 @@ static long soundfiler2_dowrite(void *obj, t_canvas *canvas,
{
soundfile_finishwrite(obj, filesym->s_name, fd,
filetype, nframes, itemswritten, nchannels * bytespersamp, swap);
- close (fd);
+ sys_close (fd);
}
return ((float)itemswritten);
usage:
@@ -1039,7 +1039,7 @@ usage:
post("(defaults to a 16-bit wave file).");
fail:
if (fd >= 0)
- close (fd);
+ sys_close (fd);
return (0);
}
@@ -1230,7 +1230,7 @@ static void *readsf_child_main(void *zz)
{
fd = x->x_fd;
pthread_mutex_unlock(&x->x_mutex);
- close (fd);
+ sys_close (fd);
pthread_mutex_lock(&x->x_mutex);
x->x_fd = -1;
if (x->x_requestcode != REQUEST_BUSY)
@@ -1383,7 +1383,7 @@ lost:
{
fd = x->x_fd;
pthread_mutex_unlock(&x->x_mutex);
- close (fd);
+ sys_close (fd);
pthread_mutex_lock(&x->x_mutex);
x->x_fd = -1;
}
@@ -1396,7 +1396,7 @@ lost:
{
fd = x->x_fd;
pthread_mutex_unlock(&x->x_mutex);
- close (fd);
+ sys_close (fd);
pthread_mutex_lock(&x->x_mutex);
x->x_fd = -1;
}
@@ -1410,7 +1410,7 @@ lost:
{
fd = x->x_fd;
pthread_mutex_unlock(&x->x_mutex);
- close (fd);
+ sys_close (fd);
pthread_mutex_lock(&x->x_mutex);
x->x_fd = -1;
}
diff --git a/externals/moonlib/sfread2~.c b/externals/moonlib/sfread2~.c
index e5e2a6fb9..8e7329bca 100644
--- a/externals/moonlib/sfread2~.c
+++ b/externals/moonlib/sfread2~.c
@@ -317,7 +317,7 @@ static void sfread_open(t_sfread *x,t_symbol *filename)
/* close the old file */
if (x->x_mapaddr) munmap(x->x_mapaddr,x->x_size);
- if (x->x_fd >= 0) close(x->x_fd);
+ if (x->x_fd >= 0) sys_close(x->x_fd);
/*if ((x->x_fd = open(fname,O_RDONLY)) < 0)*/
//post("fname: %s",fname);
diff --git a/externals/tb/sndfiler/src/file_input.c b/externals/tb/sndfiler/src/file_input.c
index 79ad27e37..210a08060 100644
--- a/externals/tb/sndfiler/src/file_input.c
+++ b/externals/tb/sndfiler/src/file_input.c
@@ -27,12 +27,12 @@ int check_fileformat(t_symbol* file)
OggVorbis_File vorbisfile;
// partially opens a vorbis file to test for Vorbis-ness
- if( !(fp = fopen(file->s_name, "r")) )
+ if( !(fp = sys_fopen(file->s_name, "r")) )
return -1;
if( ov_test(fp, &vorbisfile, NULL, 0) < 0 )
{
- fclose(fp);
+ sys_fclose(fp);
return USE_LIBSNDFILE;
}
@@ -145,12 +145,12 @@ int read_libvorbisfile(t_float** helper_arrays, int channel_count, int seek,
OggVorbis_File vorbisfile;
vorbis_info *info;
- if( !(fp = fopen(file->s_name, "r")) )
+ if( !(fp = sys_fopen(file->s_name, "r")) )
return -1;
if( ov_open(fp, &vorbisfile, NULL, 0) < 0 )
{
- fclose(fp);
+ sys_fclose(fp);
return -1;
}
--
GitLab