Changeset 1921

Timestamp:

02/25/09 13:13:16 (3 years ago)

Author:

mwhitworth

Message:

Fix case where we printed out completions in /applications twice (when we are in /applications), set cwd to NULL.

Files:

• Whitix/trunk/user/burn/main.c (modified) (2 diffs)

Whitix/trunk/user/burn/main.c

@@ -274 +274 @@
 char* CommandCompleter(struct ConsReadContext* context, char* string, int state)
 {
-        struct FileDirEnt* ent;
+        struct FileDirEnt* ent = NULL;
         struct FileDirEnt* cwdent;
         struct Stat stat;
         struct CmdTable* currCmd;
-        
+                
         if (!state)
         {
@@ -290 +290 @@
         }
         
-        while ( ( ent = FileDirNext(dir) ) )
-        {
-                if (ent->name[0] == '.')
-                        continue;
-                        
-                if (SysStat(ent->name, &stat, dir->fd))
-                        continue;
-                        
-                /* Only files can be executed. */
-                if (!(stat.mode & _SYS_STAT_FILE))
-                        continue;
-                        
-                if (!strncasecmp(string, ent->name, strlen(string)))
-                        goto out;
+//      printf("%s %s, %d\n", "/applications/", currPath, strcasecmp(currPath, "/applications/"));
+        
+        if (strcasecmp(currPath, "/applications/"))
+        {
+                while ( ( ent = FileDirNext(dir) ) )
+                {
+                        if (ent->name[0] == '.')
+                                continue;
+                        
+                        if (SysStat(ent->name, &stat, dir->fd))
+                                continue;
+                        
+                        /* Only files can be executed. */
+                        if (!(stat.mode & _SYS_STAT_FILE))
+                                continue;
+                        
+                        if (!strncasecmp(string, ent->name, strlen(string)))
+                                goto out;
+                }
         }