From f28964e353e4bfb83990742be6f258cdcc78c03a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 20 Feb 2014 22:55:42 +0100 Subject: [PATCH 1/1] net-util: match - allow globbing For now support globbing for interface name and path. --- src/shared/net-util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared/net-util.c b/src/shared/net-util.c index 06c50b593..6008a41da 100644 --- a/src/shared/net-util.c +++ b/src/shared/net-util.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "net-util.h" #include "log.h" @@ -56,7 +57,7 @@ bool net_match_config(const struct ether_addr *match_mac, if (match_mac && (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN))) return 0; - if (match_path && !streq_ptr(match_path, dev_path)) + if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0))) return 0; if (match_driver && !streq_ptr(match_driver, dev_driver)) @@ -65,7 +66,7 @@ bool net_match_config(const struct ether_addr *match_mac, if (match_type && !streq_ptr(match_type, dev_type)) return 0; - if (match_name && !streq_ptr(match_name, dev_name)) + if (match_name && (!dev_path || fnmatch(match_name, dev_name, 0))) return 0; return 1; -- 2.30.2