Changeset 1098

Timestamp:

10/11/08 18:27:36 (1 month ago)

Author:

mwhitworth

Message:

Integrate patch to search the current directory commands, change author, add cp as an alias for BtInCopy.

Location:

Whitix/branches/keobject/user/burn

Files:

• builtins.c (modified) (1 diff)
• help.c (modified) (1 diff)
• main.c (modified) (4 diffs)

Whitix/branches/keobject/user/burn/builtins.c

@@ -567 +567 @@
         {"cd",BtInChDir},
         {"chdir",BtInChDir},
+        {"cp", BtInCopy},
         {"copy",BtInCopy},
         {"echo",BtInEcho},

Whitix/branches/keobject/user/burn/help.c

@@ -26 +26 @@
         {"authors", "The burn authors", 
                 BOLD_TEXT("AUTHORS") "\nMatthew Whitworth\n\n"
-                BOLD_TEXT("CONTRIBUTORS") "\nKostadin Dominov"},
+                BOLD_TEXT("CONTRIBUTORS") "\nKostadin Damyanov"},
         {"burn", "About burn",
                 BOLD_TEXT("ABOUT BURN")"\n\nBurn is an interactive shell for the Whitix operating system. It features "

Whitix/branches/keobject/user/burn/main.c

@@ -111 +111 @@
 
 struct FileDirectory* dir=NULL;
+struct FileDirectory* cwdir=NULL;
 
 char* CommandCompleter(struct ConsReadContext* context, char* string, int state)
 {
         struct FileDirEnt* ent;
+        struct FileDirEnt* cwdent;
         struct Stat stat;
         
@@ -120 +122 @@
         {
                 dir=FileDirOpen("/Applications");
+                cwdir=FileDirOpen(currPath);
                 
                 if (!dir)
@@ -141 +144 @@
         }
         
-        if (!ent)
+        while ( ( cwdent = FileDirNext(cwdir) ) )
+        {
+                if (cwdent->name[0] == '.')
+                        continue;
+                        
+                if (SysStat(cwdent->name, &stat, cwdir->fd))
+                        continue;
+                        
+                /* Only files can be executed. */
+                if (!(stat.mode & _SYS_STAT_FILE))
+                        continue;
+                        
+                if (!strncasecmp(string, cwdent->name, strlen(string)))
+                        break;
+        }
+        
+        if (!ent && !cwdent)
         {
                 FileDirClose(dir);
+                FileDirClose(cwdir);
                 return NULL;
         }
         
+        if(!ent && cwdent)
+        {
+                return strdup(cwdent->name);
+        }
+        
         return strdup(ent->name);
 }
@@ -153 +178 @@
 {
         struct FileDirEnt* ent;
+        struct FileDirEnt* cwdent;
         char* name, *entName;
         static char* dirName;