Hi Thien,
ACK from me.
Best Regards,
ThuanTr
-----Original Message-----
From: Thien Minh Huynh <thien.m.hu...@dektech.com.au>
Sent: Thursday, November 12, 2020 5:16 PM
To: Thuan Tran <thuan.t...@dektech.com.au>; Thang Duc Nguyen
<thang.d.ngu...@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net; Thien Minh Huynh
<thien.m.hu...@dektech.com.au>
Subject: [PATCH 1/1] imm: prevent override delimiter value when using with
option -a [#3235]
when using option -d to set delimiter for multiple value combine with
option -a. Delimiter was override with default value. The fix is checking
delimiter option before assign default value.
---
src/imm/tools/imm_list.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/imm/tools/imm_list.c b/src/imm/tools/imm_list.c
index b5694bb42..680bac91f 100644
--- a/src/imm/tools/imm_list.c
+++ b/src/imm/tools/imm_list.c
@@ -83,7 +83,7 @@ static void usage(const char *progname)
printf("\timmlist -a saAmfApplicationAdminState safApp=OpenSAF\n");
printf("\timmlist safApp=myApp1 safApp=myApp2\n");
printf("\timmlist --pretty-print=no -a saAmfAppType safApp=OpenSAF\n");
- printf("\timmlist -d '|' -a safAmfNodeGroup
safAmfNodeGroup=AllNodes,safAmfCluster=myAmfCluster\n");
+ printf("\timmlist -d '|' -a saAmfNGNodeList
safAmfNodeGroup=AllNodes,safAmfCluster=myAmfCluster\n");
}
static void print_attr_value_raw(SaImmValueTypeT attrValueType,
@@ -492,6 +492,7 @@ int main(int argc, char *argv[])
int rc = EXIT_SUCCESS;
unsigned long timeoutVal = 60;
char delimiter = ' ';
+ bool is_existed_delimiter = false;
/* Support for long DN */
setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
@@ -513,7 +514,8 @@ int main(int argc, char *argv[])
attributeNames, ++len * sizeof(SaImmAttrNameT));
attributeNames[len - 2] = strdup(optarg);
attributeNames[len - 1] = NULL;
- delimiter = ':';
+ if (!is_existed_delimiter)
+ delimiter = ':';
pretty_print = 0;
break;
case 'c':
@@ -537,6 +539,7 @@ int main(int argc, char *argv[])
"delimiter must be a single character\n");
exit(EXIT_FAILURE);
}
+ is_existed_delimiter = true;
delimiter = optarg[0];
break;
default:
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
