opts_cmd_t opts;
-const char *task_bins[] = {
+static const char *task_bins[] = {
"./gmqcc",
"./qcvm"
};
int pid;
} popen_t;
-FILE ** task_popen(const char *command, const char *mode) {
+static FILE ** task_popen(const char *command, const char *mode) {
int inhandle [2];
int outhandle [2];
int errhandle [2];
close(errhandle[0]);
/* see piping documentation for this sillyness :P */
- close(0), dup(inhandle [0]);
- close(1), dup(outhandle[1]);
- close(2), dup(errhandle[1]);
+ close(0); (void)!dup(inhandle [0]);
+ close(1); (void)!dup(outhandle[1]);
+ close(2); (void)!dup(errhandle[1]);
execvp(*argv, argv);
exit(EXIT_FAILURE);
return NULL;
}
-int task_pclose(FILE **handles) {
+static int task_pclose(FILE **handles) {
popen_t *data = (popen_t*)handles;
int status = 0;
return status;
}
#else
- /*
- * Bidirectional piping implementation for windows using CreatePipe and DuplicateHandle +
- * other hacks.
- */
typedef struct {
- int __dummy;
- /* TODO: implement */
+ FILE *handles[3];
+ char name_err[L_tmpnam];
+ char name_out[L_tmpnam];
} popen_t;
- FILE **task_popen(const char *command, const char *mode) {
- (void)command;
- (void)mode;
+ static FILE **task_popen(const char *command, const char *mode) {
+ char *cmd = NULL;
+ popen_t *open = (popen_t*)mem_a(sizeof(popen_t));
+
+ tmpnam(open->name_err);
+ tmpnam(open->name_out);
+
+ (void)mode; /* excluded */
+
+ util_asprintf(&cmd, "%s -redirout=%s -redirerr=%s", command, open->name_out, open->name_err);
- /* TODO: implement */
- return NULL;
+ system(cmd); /* HACK */
+ open->handles[0] = NULL;
+ open->handles[1] = fs_file_open(open->name_out, "r");
+ open->handles[2] = fs_file_open(open->name_err, "r");
+
+ mem_d(cmd);
+
+ return open->handles;
}
- void task_pclose(FILE **files) {
- /* TODO: implement */
- (void)files;
- return;
+ static void task_pclose(FILE **files) {
+ popen_t *open = ((popen_t*)files);
+ fs_file_close(files[1]);
+ fs_file_close(files[2]);
+ remove(open->name_err);
+ remove(open->name_out);
+
+ mem_d(open);
}
#endif /*! _WIN32 */
* This is very much like a compiler code generator :-). This generates
* a value from some data observed from the compiler.
*/
-bool task_template_generate(task_template_t *tmpl, char tag, const char *file, size_t line, char *value, size_t *pad) {
+static bool task_template_generate(task_template_t *tmpl, char tag, const char *file, size_t line, char *value, size_t *pad) {
size_t desclen = 0;
size_t filelen = 0;
char **destval = NULL;
case 'I': destval = &tmpl->sourcefile; break;
case 'F': destval = &tmpl->testflags; break;
default:
- con_printmsg(LVL_ERROR, __FILE__, __LINE__, "internal error",
+ con_printmsg(LVL_ERROR, __FILE__, __LINE__, 0, "internal error",
"invalid tag `%c:` during code generation\n",
tag
);
* assigned value.
*/
if (*destval) {
- con_printmsg(LVL_ERROR, file, line, "compile error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "compile error",
"tag `%c:` already assigned value: %s\n",
tag, *destval
);
return true;
}
-bool task_template_parse(const char *file, task_template_t *tmpl, FILE *fp, size_t *pad) {
+static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *fp, size_t *pad) {
char *data = NULL;
char *back = NULL;
size_t size = 0;
*/
case '/':
if (data[1] != '/') {
- con_printmsg(LVL_ERROR, file, line, "tmpl parse error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "tmpl parse error",
"invalid character `/`, perhaps you meant `//` ?");
mem_d(back);
case 'I':
case 'F':
if (data[1] != ':') {
- con_printmsg(LVL_ERROR, file, line, "tmpl parse error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "tmpl parse error",
"expected `:` after `%c`",
*data
);
goto failure;
}
if (!task_template_generate(tmpl, *data, file, line, &data[3], pad)) {
- con_printmsg(LVL_ERROR, file, line, "tmpl compile error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "tmpl compile error",
"failed to generate for given task\n"
);
goto failure;
{
char *value = &data[3];
if (data[1] != ':') {
- con_printmsg(LVL_ERROR, file, line, "tmpl parse error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "tmpl parse error",
"expected `:` after `%c`",
*data
);
}
default:
- con_printmsg(LVL_ERROR, file, line, "tmpl parse error",
+ con_printmsg(LVL_ERROR, file, line, 0, /*TODO: column for match*/ "tmpl parse error",
"invalid tag `%c`", *data
);
goto failure;
* Nullifies the template data: used during initialization of a new
* template and free.
*/
-void task_template_nullify(task_template_t *tmpl) {
+static void task_template_nullify(task_template_t *tmpl) {
if (!tmpl)
return;
tmpl->testflags = NULL;
}
-task_template_t *task_template_compile(const char *file, const char *dir, size_t *pad) {
+static task_template_t *task_template_compile(const char *file, const char *dir, size_t *pad) {
/* a page should be enough */
char fullfile[4096];
size_t filepadd = 0;
return NULL;
}
-void task_template_destroy(task_template_t **tmpl) {
+static void task_template_destroy(task_template_t **tmpl) {
if (!tmpl)
return;
bool compiled;
} task_t;
-task_t *task_tasks = NULL;
+static task_t *task_tasks = NULL;
/*
* Read a directory and searches for all template files in it
* which is later used to run all tests.
*/
-bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
+static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
bool success = true;
DIR *dir;
struct dirent *files;
* Task precleanup removes any existing temporary files or log files
* left behind from a previous invoke of the test-suite.
*/
-void task_precleanup(const char *curdir) {
+static void task_precleanup(const char *curdir) {
DIR *dir;
struct dirent *files;
char buffer[4096];
fs_dir_close(dir);
}
-void task_destroy(void) {
+static void task_destroy(void) {
/*
* Free all the data in the task list and finally the list itself
* then proceed to cleanup anything else outside the program like
* messages IF the procedure type is -execute, otherwise it matches
* the preprocessor output.
*/
-bool task_trymatch(task_template_t *tmpl, char ***line) {
+static bool task_trymatch(task_template_t *tmpl, char ***line) {
bool success = true;
bool preprocessing = false;
FILE *execute;
return success;
}
-const char *task_type(task_template_t *tmpl) {
+static const char *task_type(task_template_t *tmpl) {
if (!strcmp(tmpl->proceduretype, "-pp"))
return "type: preprocessor";
if (!strcmp(tmpl->proceduretype, "-execute"))
* from thin air and executed INLINE.
*/
#include <math.h>
-void task_schedualize(size_t *pad) {
+static void task_schedualize(size_t *pad) {
char space[2][64];
bool execute = false;
char *data = NULL;
*
* It expects con_init() was called before hand.
*/
-GMQCC_WARN bool test_perform(const char *curdir, const char *defs) {
+static GMQCC_WARN bool test_perform(const char *curdir, const char *defs) {
static const char *default_defs = "defs.qh";
size_t pad[] = {
projects / xonotic / gmqcc.git / blobdiff