darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-31 03:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes, but still crashes because ... I have no clue, there is no reason for this to crash.

Browse source
This commit is contained in:
Dale Weiler 2012-12-17 15:38:32 +00:00
parent a473979cf5
commit e72d656eb8
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ftepp.c
View file

@ -1369,6 +1369,13 @@ bool ftepp_preprocess_string(const char *name, const char *str)
void ftepp_add_macro(const char *name, const char *value) {
char *create = NULL;
/* use saner path for empty macros */
if (!value) {
ftepp_add_define("__builtin__", name);
return;
}
vec_upload(create, "#define ", 8);
vec_upload(create, name, strlen(name));
vec_push (create, ' ');

33
main.c
View file

@ -312,13 +312,19 @@ static bool options_parse(int argc, char **argv) {
break;
case 'D':
if (!(argarg = strchr(argv[0] + 2, '='))) {
con_out("missing = in -D\n");
if (!strlen(argv[0]+2)) {
con_err("expected name after -D\n");
exit(0);
}
*argarg='\0'; /* terminate for name */
macro.name = util_strdup(argarg);
macro.value = util_strdup(argv[0]+2);
if (!(argarg = strchr(argv[0] + 2, '='))) {
macro.name = util_strdup(argv[0]+2);
macro.value = NULL;
} else {
*argarg='\0'; /* terminate for name */
macro.name = util_strdup(argv[0]+2);
macro.value = util_strdup(argarg+1);
}
vec_push(ppems, macro);
break;
@ -625,18 +631,21 @@ int main(int argc, char **argv) {
con_err("failed to initialize parser\n");
retval = 1;
goto cleanup;
} else {
size_t i;
for (i = 0; i < vec_size(ppems); ++i) {
ftepp_add_macro(ppems[i].name, ppems[i].value);
mem_d(ppems[i].name);
mem_d(ppems[i].value);
}
}
}
util_debug("COM", "starting ...\n");
/* add macros */
for (itr = 0; itr < vec_size(ppems); itr++) {
ftepp_add_macro(ppems[itr].name, ppems[itr].value);
mem_d(ppems[itr].name);
/* can be null */
if (ppems[itr].value)
mem_d(ppems[itr].value);
}
if (!vec_size(items)) {
FILE *src;
char *line;