Changeset 1079

Timestamp:

10/03/08 12:54:00 (3 months ago)

Author:

mwhitworth

Message:

Remove strcpy, replace calls to strcpy with strncpy, misc formatting fixes.

Location:

Whitix/branches/keobject

Files:

• fs/vfs/dir.c (modified) (1 diff)
• fs/vfs/load.c (modified) (1 diff)
• fs/vfs/super.c (modified) (1 diff)
• include/string.h (modified) (1 diff)
• kernel/process.c (modified) (1 diff)
• lib/string.c (modified) (2 diffs)
• make.inc (modified) (1 diff)
• memory/mmap.c (modified) (2 diffs)

Whitix/branches/keobject/fs/vfs/dir.c

@@ -473 +473 @@
         {
                 /* Special case, why search for the root directory when it's known? */
-                strcpy(current->sCwd, dirName);
+                strncpy(current->sCwd, dirName, PATH_MAX);
 
                 if (current->cwd != current->root)

Whitix/branches/keobject/fs/vfs/load.c

@@ -312 +312 @@
 
         /* The child processes have the same current directory as the parent */ 
-        strcpy(process->sCwd,current->sCwd);
+        strncpy(process->sCwd, current->sCwd, PATH_MAX);
 
         process->cwd=current->cwd;

Whitix/branches/keobject/fs/vfs/super.c

@@ -379 +379 @@
         /* Allocate a current directory string for the kernel loading process */
         current->sCwd=(char*)MemAlloc(PATH_MAX);
-        strcpy(current->sCwd,"/");
+        strncpy(current->sCwd, "/", 1);
 
         KePrint("VFS: Sucessfully mounted the root filesystem (%s)\n",curr->name);

Whitix/branches/keobject/include/string.h

@@ -24 +24 @@
 
 int strncpy(char* dest,char* src,int len);
-int strcpy(char* dest,char* src);
 int strncmp(const char* s1,const char* s2,int num);
 int strlen(char* str);

Whitix/branches/keobject/kernel/process.c

@@ -84 +84 @@
         /* Allocate the process's name - used when listing processes or when faulting. */
         process->name=(char*)MemAlloc(strlen(name)+1);
-        strcpy(process->name, name);
+        strncpy(process->name, name, strlen(name));
 
         process->pid=pid++;

Whitix/branches/keobject/lib/string.c

@@ -32 +32 @@
 
 SYMBOL_EXPORT(strncpy);
-
-int strcpy(char* dest,char* src)
-{
-        while ((*dest++=*src++));
-        return 0;
-}
-
-SYMBOL_EXPORT(strcpy);
 
 int strncmp(const char* s1,const char* s2,int num)
@@ -198 +190 @@
         
         ret = MemAlloc(strlen(name) + 1);
-        strcpy(ret, name);
+        strncpy(ret, name, strlen(name));
         
         return ret;

Whitix/branches/keobject/make.inc

@@ -10 +10 @@
 SED = sed
 override CFLAGS += -fomit-frame-pointer -ffreestanding -fno-stack-protector -fno-builtin \
-        -nostdlib -m32 -Wall -Wextra -O2 -I$(DEPTH)include -Wno-unused-parameter
+        -nostdlib -m32 -Wall -Wextra -Os -I$(DEPTH)include -Wno-unused-parameter
 BE_VERBOSE = 0
 LD_R_FLAGS = -r -melf_i386

Whitix/branches/keobject/memory/mmap.c

@@ -84 +84 @@
                                 ret=area->vNode->fileOps->mMap(area->vNode, address, offset);
                         else
-                                ret=FileGenericReadPage(address,area->vNode,offset);
+                                ret=FileGenericReadPage(address, area->vNode, offset);
 
                         if (ret)
@@ -165 +165 @@
         address=PAGE_ALIGN(address);
 
-//      KePrint("%s: %d: MMapHandleFault(%#X, %d, %d, %d)\n", current->name, current->pid, address, error, VM_WRITE, VM_USER);
-
         /* A null pointer has been deferenced */
         if (!process || address < PAGE_SIZE)
                 return -EFAULT;
 
+//      KePrint("%s: %d: MMapHandleFault(%#X, %d, %d, %d)\n", current->name, current->pid, address, error, VM_WRITE, VM_USER);
+
         area=VmLookupAddress(process,address);
-
+        
         /* Area of memory not currently mapped? */
         if (!area)