Changes in / [d9ffc54:669e9b5] in mainline

File:

• kernel/generic/src/console/kconsole.c (modified) (3 diffs)

kernel/generic/src/console/kconsole.c

@@ -362 +362 @@
                                 putchar(current[position]);
                         
+                        if (position == 0)
+                                continue;
                         
                         /*
@@ -368 +370 @@
                          */
                         size_t beg;
-                        unsigned narg = 0;
-                        if (position == 0) {
-                                tmp[0] = '\0';
-                                beg = 0;
-                        } else {
-                                for (beg = position - 1;
-                                    (beg > 0) && (!isspace(current[beg]));
-                                    beg--) {
-                                        ;
-                                }
-                                
-                                if (isspace(current[beg]))
-                                        beg++;
-                                
-                                wstr_to_str(tmp, position - beg + 1, current + beg);
-                        }
-                        
-                        /* Count which argument number are we tabbing (narg=0 is cmd) */
-                        bool sp = false;
-                        for (; beg > 0; beg--) {
-                                if (isspace(current[beg])) {
-                                        if (!sp) {
-                                                narg++;
-                                                sp = true;
-                                        }
-                                } else
-                                        sp = false;
-                        }
-                        if (narg && isspace(current[0]))
-                                narg--;
-
+                        for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
+                            beg--);
+                        
+                        if (isspace(current[beg]))
+                                beg++;
+                        
+                        wstr_to_str(tmp, position - beg + 1, current + beg);
+                        
                         int found;
-                        if (narg == 0) {
+                        if (beg == 0) {
                                 /* Command completion */
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
@@ -407 +386 @@
                                 /* Arguments completion */
                                 cmd_info_t *cmd = parse_cmd(current);
-                                if (!cmd || !cmd->hints_enum || cmd->argc < narg)
+                                if (!cmd || !cmd->hints_enum)
                                         continue;
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,