X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=test.c;h=c726b02f1ebe0999779525f7e2be087477bb93d2;hb=52adc2113fd0235e5f8926fd2a8f365243117710;hp=2672cb6a93fa955cf6f772d49ec41348aa1789a6;hpb=92c0d6157c3d6b24ffff811a989572e2ae6d92f9;p=xonotic%2Fgmqcc.git diff --git a/test.c b/test.c index 2672cb6..c726b02 100644 --- a/test.c +++ b/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 + * Copyright (C) 2012, 2013, 2014 * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -152,6 +152,7 @@ static int task_pclose(fs_file_t **handles) { return status; } #else + #include typedef struct { fs_file_t *handles[3]; char name_err[L_tmpnam]; @@ -162,8 +163,8 @@ static int task_pclose(fs_file_t **handles) { char *cmd = NULL; popen_t *open = (popen_t*)mem_a(sizeof(popen_t)); - util_tmpnam(open->name_err); - util_tmpnam(open->name_out); + tmpnam(open->name_err); + tmpnam(open->name_out); (void)mode; /* excluded */ @@ -744,7 +745,7 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { * so we don't trample over an existing one. */ tmpl->tempfilename = NULL; - util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s", directories[i], files->d_name); + util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s.dat", directories[i], files->d_name); /* * Additional QCFLAGS enviroment variable may be used @@ -878,7 +879,8 @@ static void task_precleanup(const char *curdir) { while ((files = fs_dir_read(dir))) { if (strstr(files->d_name, "TMP") || strstr(files->d_name, ".stdout") || - strstr(files->d_name, ".stderr")) + strstr(files->d_name, ".stderr") || + strstr(files->d_name, ".dat")) { util_snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); if (remove(buffer))