Changeset d9ffc54 in mainline

Timestamp:

2016-03-16T11:27:23Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

485dacd

Parents:

669e9b5 (diff), 6b00876 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~aurelio-x/helenos/kcon-devel

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;
                         
                         /*
@@ -370 +368 @@
                          */
                         size_t beg;
-                        for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
-                            beg--);
-                        
-                        if (isspace(current[beg]))
-                                beg++;
-                        
-                        wstr_to_str(tmp, position - beg + 1, current + 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--;
+
                         int found;
-                        if (beg == 0) {
+                        if (narg == 0) {
                                 /* Command completion */
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
@@ -386 +407 @@
                                 /* Arguments completion */
                                 cmd_info_t *cmd = parse_cmd(current);
-                                if (!cmd || !cmd->hints_enum)
+                                if (!cmd || !cmd->hints_enum || cmd->argc < narg)
                                         continue;
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,