Changeset a6480d5 in mainline for uspace/app/bdsh/compl.c

Timestamp:

2011-08-21T11:44:59Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

25c1b2c, bd5f3b7, d1e196f7

Parents:

c22531fc (diff), 1877128 (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.

git-author:

Martin Sucha <> (2011-08-21 11:44:59)

git-committer:

Martin Decky <martin@…> (2011-08-21 11:44:59)

Message:

merge Martin Sucha's fixes and improvements

File:

• uspace/app/bdsh/compl.c (modified) (6 diffs)

uspace/app/bdsh/compl.c

@@ -99 +99 @@
         tokenizer_t tok;
         token_t tokens[WORD_MAX];
-        unsigned int current_token;
+        int current_token;
         size_t tokens_length;
 
@@ -127 +127 @@
         
         /* Find the current token */
-        for (current_token = 0; current_token < tokens_length; current_token++) {
+        for (current_token = 0; current_token < (int) tokens_length;
+            current_token++) {
                 token_t *t = &tokens[current_token];
                 size_t end = t->char_start + t->char_length;
@@ -137 +138 @@
                 }
         }
-        
-        if (tokens[current_token].type != TOKTYPE_SPACE) {
+        if (tokens_length == 0) current_token = -1;
+        
+        if (current_token >= 0 && tokens[current_token].type != TOKTYPE_SPACE) {
                 *cstart = tokens[current_token].char_start;
         }
@@ -154 +156 @@
                 goto error;
         }
-
-        str_ncpy(prefix, pref_size + 1, stext +
-            tokens[current_token].byte_start, pref_size);
+        prefix[pref_size] = 0;
+
+        if (current_token >= 0) {
+                str_ncpy(prefix, pref_size + 1, stext +
+                    tokens[current_token].byte_start, pref_size);
+        }
 
         /*
@@ -166 +171 @@
         /* Skip any whitespace before current token */
         int prev_token = current_token - 1;
-        if (prev_token != -1 && tokens[prev_token].type == TOKTYPE_SPACE) {
+        if (prev_token >= 0 && tokens[prev_token].type == TOKTYPE_SPACE) {
                 prev_token--;
         }
@@ -174 +179 @@
          * follows a pipe token.
          */
-        if (prev_token == -1 || tokens[prev_token].type == TOKTYPE_SPACE)
+        if (prev_token < 0 || tokens[prev_token].type == TOKTYPE_SPACE)
                 cs->is_command = true;
         else