From 4be266a9831799dcc2e67e83fc83d9db43828a64 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Wed, 18 Jul 2012 19:29:33 +0200 Subject: Implements wildcard matching in config file include. Also fixes some minor bugs in include. Thanks Kelly Cochran for suggestion and draft patch. --- sysdep/unix/main.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'sysdep/unix/main.c') diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index e0563aae..f0344a8f 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -162,29 +162,6 @@ cf_read(byte *dest, unsigned int len, int fd) return l; } -static int -cf_open(char *filename) -{ - char full_name[BIRD_FNAME_MAX]; - char *cur = filename; - int ret; - - if (*filename != '/') { - char dir[BIRD_FNAME_MAX]; - strncpy(dir, config_name, sizeof(dir)); - dir[sizeof(dir)-1] = 0; - snprintf(full_name, sizeof(full_name), "%s/%s", dirname(dir), filename); - full_name[sizeof(full_name)-1] = 0; - cur = full_name; - } - - if ((ret = open(cur, O_RDONLY)) == -1) - cf_error("Unable to open included configuration file: %s", cur); - - return ret; -} - - void sysdep_preconfig(struct config *c) { @@ -216,7 +193,6 @@ unix_read_config(struct config **cp, char *name) if (conf->file_fd < 0) return 0; cf_read_hook = cf_read; - cf_open_hook = cf_open; ret = config_parse(conf); close(conf->file_fd); return ret; -- cgit v1.2.3