Changeset 768

Timestamp:

07/09/08 18:45:59 (2 months ago)

Author:

mwhitworth

Message:

Memory map instead of reading in file. Doesn't cause bugs on loading, and is better practice anyway.

Files:

• Whitix/branches/fs/user/system/moduleadd.c (modified) (1 diff)

Whitix/branches/fs/user/system/moduleadd.c

@@ -17 +17 @@
         FILE* file=fopen(name, "r");
         unsigned int size;
-        char* buf;
         int ret;
+        DWORD address;
 
         if (!file)
+        {
+                printf("moduleadd: Could not open %s\n", name);
                 return 1;
+        }
 
         fseek(file, 0, SEEK_END);
-
         size=ftell(file);
-
         fseek(file, 0, SEEK_SET);
 
-        buf=(char*)malloc(size);
-        if (!buf)
+        address=SysMemoryMap(0, size, 5, file->fd, 0, _SYS_MMAP_PRIVATE);
+
+        if (!address)
         {
-                printf("Could not allocate memory. Exiting.\n");
-                return 2;
+                printf("Could not read %s\n", name);
+                return 1;
         }
 
-        fread(buf, size, 1, file);
+        ret=SysModuleAdd(address, size);
 
-        ret=SysModuleAdd(buf, size);
-
-        free(buf);
+        SysMemoryUnmap(address, size);
 
         /* Check ret. */
         if (ret)
                 printf("moduleadd: Error adding module %s to kernel: %s\n", name, strerror(ret));
+
+        fclose(file);
 
         return ret;