Changeset 1965 for Whitix/trunk

Timestamp:

03/09/09 17:44:32 (3 years ago)

Author:

mwhitworth

Message:

Patch from Kostadin: complete the line using the longest common substring.

Files:

• Whitix/trunk/user/sdk/console/tab.c (modified) (3 diffs)

Whitix/trunk/user/sdk/console/tab.c

@@ -29 +29 @@
 void ConsDoTabComplete(struct ConsReadContext* context, int i, char* prompt, int promptColor)
 {
-        int total=0, j;
+        int total=0, min, j, k;
         char* results[TABS_TOTAL];
         char* readBuffer=context->readBuffer;
         char* start, *end;
         char* tabInput;
+        char buffer;
 
         ConsTokenGetStr(readBuffer, i, &start, &end);
@@ -76 +77 @@
                  * prompt and help the user out.
                  */
+                 
+                /* Get the length of the shortest string. */
+                min = strlen(results[0]);
+                for(j=1; j<total; j++)
+                {
+                        if(strlen(results[j]) < min)
+                                min = strlen(results[j]);
+                }
+                
+                /* The result. */
+                char res[min+1];
+                
+                /* Get the longest common prefix. */
+                for(j=0; j<min; j++)
+                {
+                        buffer = results[0][j];
+                        for(k=1; k<total; k++)
+                        {
+                                if(buffer != results[k][j])
+                                {
+                                        /* Exit the loops. */
+                                        goto out;
+                                }
+                        }
+                        res[j] = buffer;
+                }
 
-                /* Render the prompt and readBuffer again. TODO: Call bufferUpdate? */
+out:
+                res[j] = '\0';
+                /* Update the buffer. */
+                strcpy(context->readBuffer,res);
+
+                /* Render the prompt and readBuffer again. */
                 ConsSetForeColor(promptColor);
                 fputs(prompt, stdout);
@@ -97 +129 @@
                 }
 
-                if (j > 0 && j > start+1)
+                if (j > 0 && j >= start+1)
                 {
-                        context->tabSetup(context, readBuffer, start, j);               
+                        context->tabSetup(context, readBuffer, start, j);
                         ConsBufferUpdate(context, j-1, -1);
                 }