From 934910288403aeb42ea9a54d112268dcfe906e3b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 17 May 2018 17:08:18 +0200 Subject: Handle no prefix given If no prefix given, then only use the binder name to search config file. Change-Id: I504ea27dccb8892e12e09d3e9e42bc281bcf87b0 Signed-off-by: Romain Forlot --- ctl-lib/ctl-config.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c index 581440c..4e9d01d 100644 --- a/ctl-lib/ctl-config.c +++ b/ctl-lib/ctl-config.c @@ -48,9 +48,14 @@ json_object* CtlConfigScan(const char *dirList, const char *prefix) { controlFile[CONTROL_MAXPATH_LEN - 1] = '\0'; - strncpy(controlFile, prefix, CONTROL_MAXPATH_LEN - 1); - strncat(controlFile, binderName, CONTROL_MAXPATH_LEN - strlen(controlFile) - 1); - + if(prefix[0] != '\0') { + strncpy(controlFile, prefix, CONTROL_MAXPATH_LEN - 1); + strncat(controlFile, "-", CONTROL_MAXPATH_LEN - strlen(controlFile) - 1); + strncat(controlFile, binderName, CONTROL_MAXPATH_LEN - strlen(controlFile) - 1); + } + else { + strncpy(controlFile, binderName, CONTROL_MAXPATH_LEN - 1); + } // search for default dispatch config file json_object* responseJ = ScanForConfig(dirList, CTL_SCAN_RECURSIVE, controlFile, ".json"); -- cgit 1.2.3-korg