Changeset 4302 for pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_telnet.c

Timestamp:

Nov 28, 2012 3:02:01 AM (11 years ago)

Author:

riza

Message:

Re #1098: Modify help screen, change backspace input character, fix static and dynamic choice type argument handling

File:

• pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_telnet.c (modified) (4 diffs)

pjproject/branches/projects/cli/pjlib-util/src/pjlib-util/cli_telnet.c

@@ -198 +198 @@
 
 /**
+ * This specify the state of output character parsing.
+ */
+typedef enum out_parse_state
+{
+    OP_NORMAL,
+    OP_TYPE,
+    OP_SHORTCUT,
+    OP_CHOICE
+} out_parse_state;
+
+/**
  * This structure contains the command line shown to the user.  
  */
@@ -755 +766 @@
     struct cli_telnet_fe *fe = (struct cli_telnet_fe *)sess->base.fe;
     const pj_cli_hint_info *hint = info->hint;
-    pj_bool_t is_process_sc = PJ_FALSE;
-    pj_bool_t valid_type = PJ_FALSE;
+    out_parse_state parse_state = OP_NORMAL;
     pj_ssize_t max_length = 0;
-    const pj_str_t sc_type = pj_str("SC");    
+    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.slen = 0;
@@ -779 +790 @@
 
     for (i=0;i<info->hint_cnt;++i) {    
-        if ((&hint[i].type) && (hint[i].type.slen > 0)) {
-            valid_type = PJ_TRUE;
+        pj_strcat2(&send_data, "\r\n  ");
+        
+        if ((&hint[i].type) && (hint[i].type.slen > 0)) {           
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
-                if (is_process_sc) {
-                    pj_strcat2(&send_data, ", ");
-                } else {
-                    pj_strcat2(&send_data, "\r\n\t Shorcut: ");
-                    is_process_sc = PJ_TRUE;
+                parse_state = OP_SHORTCUT;
+            } else if (pj_stricmp(&hint[i].type, &choice_type) == 0) {
+                parse_state = OP_CHOICE;
+            } else {
+                parse_state = OP_TYPE;
+            }
+        } else {                    
+            parse_state = OP_NORMAL;
+        }
+    
+        switch (parse_state) {
+        case OP_CHOICE:
+            pj_strcat2(&send_data, "[");
+            pj_strcat(&send_data, &hint[i].name);
+            pj_strcat2(&send_data, "]");        
+            break;
+        case OP_TYPE:
+            pj_strcat2(&send_data, "<");
+            pj_strcat(&send_data, &hint[i].name);
+            pj_strcat2(&send_data, ">");        
+            break;
+        default:
+            pj_strcat(&send_data, &hint[i].name);           
+            break;
+        }
+        
+        if ((&hint[i].desc) && (hint[i].desc.slen > 0)) {
+            if (parse_state != OP_TYPE) {
+                for (j=0;j<(max_length-hint[i].name.slen);++j) {
+                    pj_strcat2(&send_data, " ");
                 }
-                pj_strcat(&send_data, &hint[i].name);
-            } else {
-                is_process_sc = PJ_FALSE;
             }
-        } else {            
-            valid_type = PJ_FALSE;
-            is_process_sc = PJ_FALSE;
+            pj_strcat2(&send_data, "  ");
+            pj_strcat(&send_data, &hint[i].desc);           
         }
-
-        if (!is_process_sc) {
-            pj_strcat2(&send_data, "\r\n\t");
-
-            if (valid_type) {
-                pj_strcat2(&send_data, "<");
-                pj_strcat(&send_data, &hint[i].type);
-                pj_strcat2(&send_data, ">");    
-            } else {
-                pj_strcat(&send_data, &hint[i].name);       
-            }
-        
-            if ((&hint[i].desc) && (hint[i].desc.slen > 0)) {
-                if (!valid_type) {
-                    for (j=0;j<(max_length-hint[i].name.slen);++j) {
-                        pj_strcat2(&send_data, " ");
-                    }
-                }
-                pj_strcat2(&send_data, "\t");
-                pj_strcat(&send_data, &hint[i].desc);       
-            }
-        }
-    }   
+    }  
     pj_strcat2(&send_data, "\r\n");       
     pj_strcat(&send_data, &fe->cfg.prompt_str);
@@ -1291 +1302 @@
             if (*cdata == IAC) {
                 sess->parse_state = ST_IAC;
-            } else if (*cdata == '\b') {
+            } else if (*cdata == 127) {
                 is_valid = handle_backspace(sess, cdata);
             } else if (*cdata == 27) {