Changeset 8cc4ddb in mainline for uspace/app/bdsh/compl.c

Timestamp:

2011-08-28T21:16:54Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f0f8bc

Parents:

1a5b252 (diff), 36e2b55 (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 mainline changes.

File:

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

uspace/app/bdsh/compl.c

@@ -90 +90 @@
 {
         compl_t *cs = NULL;
-        size_t pref_size;
         char *stext = NULL;
         char *prefix = NULL;
         char *dirname = NULL;
+        int retval;
+        
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL) {
+                retval = ENOMEM;
+                goto error;
+        }
+        
+        size_t pref_size;
         char *rpath_sep;
         static const char *dirlist_arg[] = { ".", NULL };
-        int retval;
         tokenizer_t tok;
-        token_t tokens[WORD_MAX];
-        unsigned int current_token;
+        ssize_t current_token;
         size_t tokens_length;
-
+        
         cs = calloc(1, sizeof(compl_t));
         if (!cs) {
@@ -107 +113 @@
                 goto error;
         }
-
+        
         /* Convert text buffer to string */
         stext = wstr_to_astr(text);
@@ -127 +133 @@
         
         /* Find the current token */
-        for (current_token = 0; current_token < tokens_length; current_token++) {
+        for (current_token = 0; current_token < (ssize_t) tokens_length;
+            current_token++) {
                 token_t *t = &tokens[current_token];
                 size_t end = t->char_start + t->char_length;
-                /* Check if the caret lies inside the token or immediately
+                
+                /*
+                 * Check if the caret lies inside the token or immediately
                  * after it
                  */
@@ -138 +147 @@
         }
         
-        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;
-        }
-        else {
+        else
                 *cstart = pos;
-        }
-        
-        /* Extract the prefix being completed
+        
+        /*
+         * Extract the prefix being completed
          * XXX: handle strings, etc.
          */
@@ -154 +165 @@
                 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);
+        }
 
         /*
@@ -165 +179 @@
 
         /* Skip any whitespace before current token */
-        int prev_token = current_token - 1;
-        if (prev_token != -1 && tokens[prev_token].type == TOKTYPE_SPACE) {
+        ssize_t prev_token = current_token - 1;
+        if ((prev_token >= 0) && (tokens[prev_token].type == TOKTYPE_SPACE))
                 prev_token--;
-        }
-
+        
         /*
          * It is a command if it is the first token or if it immediately
          * 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
@@ -249 +262 @@
         if (cs != NULL)
                 free(cs);
+        if (tokens != NULL)
+                free(tokens);
 
         return retval;