Add a -f configfile option to devd(8), based on a patch submitted by

Wojciech A. Koszek.

Submitted by:	Wojciech A. Koszek <dunstan@freebsd.czest.pl>

1 files changed, 7 insertions, 2 deletions

diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 3528736..c7b4e43 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -83,6 +83,8 @@ int dflag;
 int nflag;
 int romeo_must_die = 0;
 
+static const char *configfile = CF;
+
 static void event_loop(void);
 static void usage(void);
 
@@ -353,7 +355,7 @@ config::parse(void)
 {
 	vector<string>::const_iterator i;
 
-	parse_one_file(CF);
+	parse_one_file(configfile);
 	for (i = _dir_list.begin(); i != _dir_list.end(); i++)
 		parse_files_in_dir((*i).c_str());
 	sort_vector(_attach_list);
@@ -908,7 +910,7 @@ main(int argc, char **argv)
 	int ch;
 
 	check_devd_enabled();
-	while ((ch = getopt(argc, argv, "Ddn")) != -1) {
+	while ((ch = getopt(argc, argv, "Ddf:n")) != -1) {
 		switch (ch) {
 		case 'D':
 			Dflag++;
@@ -916,6 +918,9 @@ main(int argc, char **argv)
 		case 'd':
 			dflag++;
 			break;
+		case 'f':
+			configfile = optarg;
+			break;
 		case 'n':
 			nflag++;
 			break;