mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-07 09:50:25 -08:00
Code Issues Projects Releases Packages Wiki Activity

Move the check of the file type before the actual opening of the file.

Browse source
This commit is contained in:
jjgarcia 2004-12-06 10:07:53 +00:00
parent 4c3b2d3ba1
commit 51707cf320
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/c/file.d
View file

@ -291,6 +291,14 @@ open_stream(cl_object fn, enum ecl_smmode smm, cl_object if_exists,
cl_object filename = si_coerce_to_filename(fn);
char *fname = filename->string.self;
if (elttype == aet_bit) {
elttype = aet_b8;
} else if (elttype != aet_b8 &&
elttype != aet_i8 &&
elttype != aet_ch) {
FEerror("~S is not a valid stream element type",
1, ecl_elttype_to_symbol(elttype));
}
if (smm == smm_input || smm == smm_probe) {
fp = fopen(fname, OPEN_R);
if (fp == NULL) {
@ -366,14 +374,6 @@ open_stream(cl_object fn, enum ecl_smmode smm, cl_object if_exists,
} else {
FEerror("Illegal stream mode ~S", 1, MAKE_FIXNUM(smm));
}
if (elttype == aet_bit) {
elttype = aet_b8;
} else if (elttype != aet_b8 &&
elttype != aet_i8 &&
elttype != aet_ch) {
FEerror("~S is not a valid stream element type",
1, ecl_elttype_to_symbol(elttype));
}
x = cl_alloc_object(t_stream);
x->stream.mode = (short)smm;
x->stream.file = fp;
@ -1899,7 +1899,7 @@ cl_output_stream_p(cl_object strm)
elttype = ecl_symbol_to_elttype(element_type);
if (elttype == aet_object) {
FEerror("~S is not a valid stream element type",
1, elttype);
1, element_type);
}
}
strm = open_stream(filename, smm, if_exists, if_does_not_exist, elttype);