RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

some fix 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1090 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
szabii 2001-06-10 23:06:44 +00:00
parent 8d38446c89
commit d4239d7b1e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cfgparser.c
View File

@ -245,11 +245,14 @@ int parse_config_file(struct config *conf, char *conffile)
#ifdef DEBUG
assert(conffile != NULL);
#endif
if (++recursion_depth > MAX_RECURSION_DEPTH) {
printf("too deep 'include'. check your configfiles\n");
--recursion_depth;
return -1;
}
if (++recursion_depth > 1)
printf("Reading config file: %s", conffile);
if (recursion_depth > MAX_RECURSION_DEPTH) {
printf(": too deep 'include'. check your configfiles\n");
ret = -1;
goto out;
}
if (init_conf(conf, CONFIG_FILE) == -1) {
ret = -1;
@ -263,10 +266,14 @@ int parse_config_file(struct config *conf, char *conffile)
}
if ((fp = fopen(conffile, "r")) == NULL) {
if (recursion_depth > 1)
printf(": %s\n", strerror(errno));
free(line);
ret = 0;
goto out;
}
if (recursion_depth > 1)
printf("\n");
while (fgets(line, MAX_LINE_LEN, fp)) {
line_num++;
@ -409,6 +416,9 @@ int parse_command_line(struct config *conf, int argc, char **argv, char **envp,
if (init_conf(conf, COMMAND_LINE) == -1)
return -1;
/* in order to work recursion detection properly in parse_config_file */
++recursion_depth;
for (i = 1; i < argc; i++) {
opt = argv[i];
if (*opt != '-') {
@ -443,9 +453,11 @@ filename:
default:
i += tmp;
}
}
}
--recursion_depth;
return found_filename;
err_out:
--recursion_depth;
printf("command line: %s\n", argv[i]);
return -1;
}