OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

replace execfile

master
Daniel Kolesa 2015-08-06 02:07:16 +01:00
parent bc50f30d22
commit f83560cad1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
command.cc
View File

@ -3138,12 +3138,12 @@ bool CsState::run_bool(Ident *id, ostd::PointerRange<TaggedValue> args) {
return b;
}
bool execfile(const char *cfgfile, bool msg) {
bool CsState::run_file(ostd::ConstCharRange fname, bool msg) {
const char *oldsourcefile = sourcefile, *oldsourcestr = sourcestr;
char *buf = nullptr;
ostd::Size len;
ostd::FileStream f(cfgfile, ostd::StreamMode::read);
ostd::FileStream f(fname, ostd::StreamMode::read);
if (!f.is_open()) goto error;
len = f.size();
@ -3154,7 +3154,7 @@ bool execfile(const char *cfgfile, bool msg) {
}
buf[len] = '\0';
sourcefile = cfgfile;
sourcefile = fname.data();
sourcestr = buf;
cstate.run_int(buf);
sourcefile = oldsourcefile;
@ -3163,10 +3163,11 @@ bool execfile(const char *cfgfile, bool msg) {
return true;
error:
if (msg) fprintf(stderr, "could not read file \"%s\"\n", cfgfile);
if (msg) ostd::err.writefln("could not read file \"%s\"", fname);
return false;
}
ICOMMAND(exec, "sb", (CsState &cs, char *file, int *msg), cs.result->set_int(execfile(file, *msg != 0) ? 1 : 0));
ICOMMAND(exec, "sb", (CsState &cs, char *file, int *msg), cs.result->set_int(cs.run_file(file, *msg != 0) ? 1 : 0));
const char *escapestring(const char *s) {
stridx = (stridx + 1) % 4;

3
command.hh
View File

@ -335,6 +335,8 @@ struct CsState {
bool run_bool(const ostd::uint *code);
bool run_bool(ostd::ConstCharRange code);
bool run_bool(Ident *id, ostd::PointerRange<TaggedValue> args);
bool run_file(ostd::ConstCharRange fname, bool msg = true);
};
extern CsState cstate;
@ -491,7 +493,6 @@ extern void freecode(ostd::uint *p);
extern void executeret(const ostd::uint *code, TaggedValue &result = *cstate.result);
extern void executeret(const char *p, TaggedValue &result = *cstate.result);
extern void executeret(Ident *id, TaggedValue *args, int numargs, TaggedValue &result = *cstate.result);
extern bool execfile(const char *cfgfile, bool msg = true);
extern void alias(const char *name, const char *action);
extern void alias(const char *name, TaggedValue &v);
extern const char *getalias(const char *name);