Changeset 37c312a in mainline

Timestamp:

2009-04-13T21:15:58Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c822026

Parents:

a1d89ad

Message:

fix tab completion in kconsole (this resolves ticket #21)

Location:

kernel/generic/src

Files:

• console/kconsole.c (modified) (2 diffs)
• debug/symtab.c (modified) (1 diff)

kernel/generic/src/console/kconsole.c

@@ -303 +303 @@
                                 continue;
                         
+                        if (found > 1) {
+                                /* No unique hint, list was printed */
+                                printf("%s> ", prompt);
+                                printf("%ls", current);
+                                print_cc('\b', wstr_length(current) - position);
+                                continue;
+                        }
+                        
+                        /* We have a hint */
+                        
                         size_t off = 0;
                         count_t i = 0;
@@ -311 +321 @@
                         }
                         
-                        if ((str_length(tmp) > 0) || (found == 1)) {
-                                /* We have a hint */
-                                printf("%ls", current + position);
-                                print_cc('\b', wstr_length(current) - position);
-                                position += str_length(tmp);
-                                
-                                if ((found == 1) && (position == wstr_length(current))) {
-                                        if (wstr_linsert(current, ' ', position, MAX_CMDLINE)) {
-                                                printf("%ls", current + position);
-                                                position++;
-                                        }
+                        printf("%ls", current + position);
+                        position += str_length(tmp);
+                        print_cc('\b', wstr_length(current) - position);
+                        
+                        if (position == wstr_length(current)) {
+                                /* Insert a space after the last completed argument */
+                                if (wstr_linsert(current, ' ', position, MAX_CMDLINE)) {
+                                        printf("%ls", current + position);
+                                        position++;
                                 }
-                        } else {
-                                /* No unique hint, list was printed */
-                                printf("%s> ", prompt);
-                                printf("%ls", current);
-                                position += str_length(tmp);
-                        }
-                        
-                        print_cc('\b', wstr_length(current) - position);
+                        }
                         continue;
                 }

kernel/generic/src/debug/symtab.c

@@ -121 +121 @@
                 const char *curname = symbol_table[pos].symbol_name;
                 
-                /* Find a ':' in name */
+                /* Find a ':' in curname */
                 const char *colon = str_chr(curname, ':');
                 if (colon == NULL)