Changeset 4513 for pjproject/trunk/pjlib-util/src/pjlib-util/cli_console.c

Timestamp:

May 3, 2013 8:47:14 AM (11 years ago)

Author:

riza

Message:

Re #1643: - Modification to shortcut handling(execution&display).

• Add exact match check to the parse input command process.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/cli_console.c (modified) (8 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/cli_console.c

@@ -182 +182 @@
     struct cli_console_fe *fe = (struct cli_console_fe *)sess->fe;
 
-    send_data.ptr = &data_str[0];
+    send_data.ptr = data_str;
     send_data.slen = 0;
     
@@ -202 +202 @@
     struct cli_console_fe *fe = (struct cli_console_fe *)sess->fe;
 
-    send_data.ptr = &data_str[0];
+    send_data.ptr = data_str;
     send_data.slen = 0;
 
@@ -273 +273 @@
     static const pj_str_t sc_type = {"sc", 2};
     static const pj_str_t choice_type = {"choice", 6};
-    send_data.ptr = &data[0];
+    send_data.ptr = data;
     send_data.slen = 0;
     
@@ -288 +288 @@
     for (i=0;i<info->hint_cnt;++i) {
         if ((&hint[i].type) && (hint[i].type.slen > 0)) {           
-            if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
-                //Additional delimiter " | "
-                cmd_length += (hint[i].name.slen + 3);
+            if (pj_stricmp(&hint[i].type, &sc_type) == 0) {             
+                if ((i > 0) && (!pj_stricmp(&hint[i-1].desc, &hint[i].desc))) {
+                    cmd_length += (hint[i].name.slen + 3);
+                } else {
+                    cmd_length = hint[i].name.slen;
+                }               
             } else {
                 cmd_length = hint[i].name.slen;
@@ -304 +307 @@
 
     cmd_length = 0;
-    for (i=0;i<info->hint_cnt;++i) {    
+    for (i=0;i<info->hint_cnt;++i) {
         if ((&hint[i].type) && (hint[i].type.slen > 0)) {           
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
@@ -317 +320 @@
         }
 
-        if ((parse_state != OP_SHORTCUT)) {
-            if (cmd_desc) {
-                /* Print data if previous hint is shortcut */
-                send_hint_arg(&send_data, cmd_desc, cmd_length, max_length);
-                cmd_desc = 0;
-            }
+        if (parse_state != OP_SHORTCUT) {
             pj_strcat2(&send_data, "\r\n  ");
             cmd_length = hint[i].name.slen;
@@ -338 +336 @@
             pj_strcat2(&send_data, ">");        
             break;
-        case OP_SHORTCUT:           
-            pj_strcat2(&send_data, " | ");
-            pj_strcat(&send_data, &hint[i].name);
-            cmd_length += (hint[i].name.slen + 3);
+        case OP_SHORTCUT:
+            /* Format : "Command | sc |  description" */
+            {           
+                cmd_length += hint[i].name.slen;
+                if ((i > 0) && (!pj_stricmp(&hint[i-1].desc, &hint[i].desc))) {
+                    pj_strcat2(&send_data, " | ");
+                    cmd_length += 3;                
+                } else {
+                    pj_strcat2(&send_data, "\r\n  ");
+                }
+                pj_strcat(&send_data, &hint[i].name);   
+            }
             break;
         default:
@@ -350 +356 @@
         
         if ((parse_state == OP_TYPE) || (parse_state == OP_CHOICE) || 
-            ((i+1) >= info->hint_cnt)) 
+            ((i+1) >= info->hint_cnt) ||
+            (pj_strncmp(&hint[i].desc, &hint[i+1].desc, hint[i].desc.slen))) 
         {
             /* Add description info */
             send_hint_arg(&send_data, &hint[i].desc, cmd_length, max_length);
+
+            cmd_length = 0;
         }
     }