comparison cfgparser.c @ 1075:a981413af7cd

: No such... fix

1074:e196f109ff8a

		printf("too deep 'include'. check your configfiles\n");
		--recursion_depth;
		return -1;
	}		

	if (verbose) printf("Reading config file: %s", conffile);

	if (init_conf(conf, CONFIG_FILE) == -1) {
		ret = -1;
		goto out;
	}

		ret = -1;
		goto out;
	}

	if ((fp = fopen(conffile, "r")) == NULL) {
		if (!verbose) printf("Reading config file: %s", conffile);
		printf(": %s\n", strerror(errno));
		free(line);
		ret = 0;
		goto out;
	}
	if (verbose) printf("\n");

	while (fgets(line, MAX_LINE_LEN, fp)) {
		line_num++;
		line_pos = 0;

	if (init_conf(conf, COMMAND_LINE) == -1)
		return -1;

	for (i = 1; i < argc; i++) {
		opt = argv[i];
		if (*opt != '-')
			goto not_an_option;

		/* remove trailing '-' */
		opt++;

		tmp = read_option(opt, argv[i + 1]);

		switch (tmp) {
		case ERR_NOT_AN_OPTION:
not_an_option:
			/* opt is not an option -> treat it as a filename */
			if (found_filename) {
				/* we already have a filename */
				goto err_out;
			} else {
				found_filename = 1;
				*filename = argv[i];
				continue;	/* next option */
			}
			break;
		case ERR_MISSING_PARAM:
		case ERR_OUT_OF_RANGE:
		case ERR_FUNC_ERR:
			goto err_out;
			/* break; */
		}

		i += tmp;	/* we already processed the params (if there was any) */
	}	
	return found_filename;
err_out:
	printf("parse_command_line: %s\n", argv[i]);
	return -1;
}

1075:a981413af7cd

		printf("too deep 'include'. check your configfiles\n");
		--recursion_depth;
		return -1;
	}		

//	printf("Reading config file: %s", conffile);

	if (init_conf(conf, CONFIG_FILE) == -1) {
		ret = -1;
		goto out;
	}

		ret = -1;
		goto out;
	}

	if ((fp = fopen(conffile, "r")) == NULL) {
//		printf(": %s\n", strerror(errno));
		free(line);
		ret = 0;
		goto out;
	}
//	printf("\n");

	while (fgets(line, MAX_LINE_LEN, fp)) {
		line_num++;
		line_pos = 0;

	if (init_conf(conf, COMMAND_LINE) == -1)
		return -1;

	for (i = 1; i < argc; i++) {
		opt = argv[i];
		if (*opt != '-') {
			if (found_filename) {
				printf("invalid option:\n");
				goto err_out;
			}
			goto filename;
		}

		/* remove trailing '-' */
		opt++;

		tmp = read_option(opt, argv[i + 1]);

		switch (tmp) {
		case ERR_NOT_AN_OPTION:
			/* opt is not an option -> treat it as a filename */
			if (found_filename) {
				/* we already have a filename */
				goto err_out;
			}
filename:
			found_filename = 1;
			*filename = argv[i];
			break;
		case ERR_MISSING_PARAM:
		case ERR_OUT_OF_RANGE:
		case ERR_FUNC_ERR:
			goto err_out;
			/* break; */
		default:
			i += tmp;
		}
	}	
	return found_filename;
err_out:
	printf("command line: %s\n", argv[i]);
	return -1;
}