-/*
- * Copyright (C) 2012, 2013
- * Wolfgang Bumiller
- * Dale Weiler
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
#include <string.h>
#include <stdlib.h>
static void opts_setdefault(void) {
memset(&opts, 0, sizeof(opts_cmd_t));
- OPTS_OPTION_BOOL(OPTION_CORRECTION) = true;
- OPTS_OPTION_STR(OPTION_PROGSRC) = "progs.src";
+ OPTS_OPTION_STR(OPTION_PROGSRC) = "progs.src";
/* warnings */
opts_set(opts.warn, WARN_UNUSED_VARIABLE, true);
opts_set(opts.warn, WARN_PARENTHESIS, true);
opts_set(opts.warn, WARN_CONST_OVERWRITE, true);
opts_set(opts.warn, WARN_DIRECTIVE_INMACRO, true);
+ opts_set(opts.warn, WARN_BUILTINS, true);
+ opts_set(opts.warn, WARN_INEXACT_COMPARES, true);
/* flags */
opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true);
opts_set(opts.flags, LEGACY_VECTOR_MATHS, true);
opts_set(opts.flags, DARKPLACES_STRING_TABLE_BUG, true);
+ /* options */
+ OPTS_OPTION_U32(OPTION_STATE_FPS) = 10;
}
void opts_backup_non_Wall() {
void opts_init(const char *output, int standard, size_t arraysize) {
opts_setdefault();
- OPTS_OPTION_STR(OPTION_OUTPUT) = (char*)output;
+ OPTS_OPTION_STR(OPTION_OUTPUT) = output;
OPTS_OPTION_U32(OPTION_STANDARD) = standard;
OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE) = arraysize;
- OPTS_OPTION_U16(OPTION_MEMDUMPCOLS) = 16;
}
static bool opts_setflag_all(const char *name, bool on, uint32_t *flags, const opts_flag_def_t *list, size_t listsize) {
* from a progs.src.
*/
static char *opts_ini_rstrip(char *s) {
- char *p = s + strlen(s);
- while(p > s && util_isspace(*--p))
- *p = '\0';
+ char *p = s + strlen(s) - 1;
+ while (p > s && util_isspace(*p))
+ *p = '\0', p--;
return s;
}
}
static size_t opts_ini_parse (
- fs_file_t *filehandle,
- char *(*loadhandle)(const char *, const char *, const char *),
- char **errorhandle
+ FILE *filehandle,
+ char *(*loadhandle)(const char *, const char *, const char *, char **),
+ char **errorhandle,
+ char **parse_file
) {
size_t linesize;
size_t lineno = 1;
char *read_name;
char *read_value;
- while (fs_file_getline(&line, &linesize, filehandle) != FS_FILE_EOF) {
+ while (util_getline(&line, &linesize, filehandle) != EOF) {
parse_beg = line;
/* handle BOM */
} else if (*parse_beg && *parse_beg != ';') {
/* not a comment, must be a name value pair :) */
if (*(parse_end = opts_ini_next(parse_beg, '=')) != '=')
- parse_end = opts_ini_next(parse_beg, ':');
+ parse_end = opts_ini_next(parse_beg, ':');
if (*parse_end == '=' || *parse_end == ':') {
*parse_end = '\0'; /* terminate bro */
util_strncpy(oldname_data, read_name, sizeof(oldname_data));
oldname_data[sizeof(oldname_data) - 1] ='\0';
- if ((*errorhandle = loadhandle(section_data, read_name, read_value)) && !error)
+ if ((*errorhandle = loadhandle(section_data, read_name, read_value, parse_file)) && !error)
+ error = lineno;
+ } else if (!strcmp(section_data, "includes")) {
+ /* Includes are special */
+ if (*(parse_end = opts_ini_next(parse_beg, '=')) == '='
+ || *(parse_end = opts_ini_next(parse_beg, ':')) == ':') {
+ static const char *invalid_include = "invalid use of include";
+ vec_append(*errorhandle, strlen(invalid_include), invalid_include);
error = lineno;
+ } else {
+ read_name = opts_ini_rstrip(parse_beg);
+ if ((*errorhandle = loadhandle(section_data, read_name, read_name, parse_file)) && !error)
+ error = lineno;
+ }
} else if (!error) {
/* otherwise set error to the current line number */
error = lineno;
}
mem_d(line);
return error;
+
}
/*
return !!strtol(value, NULL, 10);
}
-static char *opts_ini_load(const char *section, const char *name, const char *value) {
+static char *opts_ini_load(const char *section, const char *name, const char *value, char **parse_file) {
char *error = NULL;
bool found = false;
#undef GMQCC_TYPE_OPTIMIZATIONS
#undef GMQCC_TYPE_WARNS
+ /* deal with includes */
+ if (!strcmp(section, "includes")) {
+ static const char *include_error_beg = "failed to open file `";
+ static const char *include_error_end = "' for inclusion";
+ FILE *file = fopen(value, "r");
+ found = true;
+ if (!file) {
+ vec_append(error, strlen(include_error_beg), include_error_beg);
+ vec_append(error, strlen(value), value);
+ vec_append(error, strlen(include_error_end), include_error_end);
+ } else {
+ if (opts_ini_parse(file, &opts_ini_load, &error, parse_file) != 0)
+ found = false;
+ /* Change the file name */
+ mem_d(*parse_file);
+ *parse_file = util_strdup(value);
+ fclose(file);
+ }
+ }
+
/* flags */
#define GMQCC_TYPE_FLAGS
#define GMQCC_DEFINE_FLAG(X) \
/* nothing was found ever! */
if (!found) {
- if (strcmp(section, "flags") &&
- strcmp(section, "warnings") &&
+ if (strcmp(section, "includes") &&
+ strcmp(section, "flags") &&
+ strcmp(section, "warnings") &&
strcmp(section, "optimizations"))
{
- vec_append(error, 17, "invalid section `");
+ static const char *invalid_section = "invalid_section `";
+ vec_append(error, strlen(invalid_section), invalid_section);
vec_append(error, strlen(section), section);
- vec_push (error, '`');
- vec_push (error, '\0');
- } else {
- vec_append(error, 18, "invalid variable `");
+ vec_push(error, '`');
+ } else if (strcmp(section, "includes")) {
+ static const char *invalid_variable = "invalid_variable `";
+ static const char *in_section = "` in section: `";
+ vec_append(error, strlen(invalid_variable), invalid_variable);
vec_append(error, strlen(name), name);
- vec_push (error, '`');
- vec_append(error, 14, " in section: `");
+ vec_append(error, strlen(in_section), in_section);
vec_append(error, strlen(section), section);
- vec_push (error, '`');
- vec_push (error, '\0');
+ vec_push(error, '`');
+ } else {
+ static const char *expected_something = "expected something";
+ vec_append(error, strlen(expected_something), expected_something);
}
}
+ vec_push(error, '\0');
return error;
}
* gmqcc.cfg
*/
char *error = NULL;
+ char *parse_file = NULL;
size_t line;
- fs_file_t *ini;
+ FILE *ini;
if (!file) {
/* try ini */
- if (!(ini = fs_file_open((file = "gmqcc.ini"), "r")))
+ if (!(ini = fopen((file = "gmqcc.ini"), "r")))
/* try cfg */
- if (!(ini = fs_file_open((file = "gmqcc.cfg"), "r")))
+ if (!(ini = fopen((file = "gmqcc.cfg"), "r")))
return;
- } else if (!(ini = fs_file_open(file, "r")))
+ } else if (!(ini = fopen(file, "r")))
return;
con_out("found ini file `%s`\n", file);
- if ((line = opts_ini_parse(ini, &opts_ini_load, &error)) != 0) {
+ parse_file = util_strdup(file);
+ if ((line = opts_ini_parse(ini, &opts_ini_load, &error, &parse_file)) != 0) {
/* there was a parse error with the ini file */
- con_printmsg(LVL_ERROR, file, line, 0 /*TODO: column for ini error*/, "error", error);
+ con_printmsg(LVL_ERROR, parse_file, line, 0 /*TODO: column for ini error*/, "error", error);
vec_free(error);
}
+ mem_d(parse_file);
- fs_file_close(ini);
+ fclose(ini);
}
projects / xonotic / gmqcc.git / blobdiff