Changeset 2048

Timestamp:

04/03/09 19:08:21 (3 years ago)

Author:

mwhitworth

Message:

Copy the command line over.

Files:

• Whitix/trunk/fs/vfs/load.c (modified) (6 diffs)

Whitix/trunk/fs/vfs/load.c

@@ -46 +46 @@
         int* fds;
         char** argv;
-        int argc;
+        int argc, argCount; /* FIXME: difference? */
         DWORD entryPoint,stackPos;
         DWORD* stackP;
@@ -182 +182 @@
         DWORD currVirtPage=0;
         int err=0;
-        args->argc+=count;
+        args->argc += count;
 
         PreemptDisable();
@@ -268 +268 @@
 static int ExecCopyArgs(struct ExecArgs* args)
 {
-        int argCount;
-        
         /* FIXME: Should be less than PAGE_SIZE*NUM_ARG_PAGES? */
-        argCount=ExecCountArgs(args->argv, PAGE_SIZE*NUM_ARG_PAGES);
-        if (argCount < 0)
-                return argCount;
+        args->argCount=ExecCountArgs(args->argv, PAGE_SIZE*NUM_ARG_PAGES);
+        
+        if (args->argCount < 0)
+                return args->argCount;
                 
         if (args->argv)
-                ExecCopyStrings(args, args->argv, argCount);
+                ExecCopyStrings(args, args->argv, args->argCount);
 
         ExecCopyStrings(args, &args->process->name, 1);
 
         return ExecSetupArgs(args);
+}
+
+static int ExecCopyCmdLine(struct ExecArgs* args)
+{
+        int i;
+        int len = 1 + strlen(args->process->name);
+        char* p;
+        
+        for (i = 0; i < args->argCount; i++)
+        {
+                len += strlen(args->argv[i]) + 1;
+        }
+        
+        p = args->process->cmdLine = (char*)MemAlloc(len);
+        
+        p = stpcpy(p, args->process->name);
+        
+        for (i = 0; i < args->argCount; i++)
+        {
+                *p = ' ';
+                p++;
+                
+                p = stpcpy(p, args->argv[i]);
+        }
+        
+        return 0;
 }
 
@@ -373 +398 @@
         struct Process* process;
 
-        ExecSetupContext(&execArgs,pathName,fds,argv);
+        ExecSetupContext(&execArgs,pathName,fds, argv);
 
         /* Open executable */
@@ -391 +416 @@
         err=ExecCopyArgs(&execArgs);
 
+        if (err)
+                return err;
+                
+        /* Save off the command line so we can retrieve it later. */
+        err = ExecCopyCmdLine(&execArgs);
+        
         if (err)
                 return err;
@@ -569 +600 @@
         VirtSetCurrent(args->process->memManager);
 
+        VirtMemMapPage(ARCH_STACK_TOP - PAGE_SIZE, PageAlloc()->physAddr, 7);
+        ZeroMemory(ARCH_STACK_TOP - PAGE_SIZE, PAGE_SIZE);
+
         /* The dynamic linker need this information to find out the base of the linker etc. */
 
-        PUSH_AUX_ENT(args->stackP,AT_NULL, 0); /* Marker. */
-        PUSH_AUX_ENT(args->stackP,AT_PAGESZ, PAGE_SIZE);
-        PUSH_AUX_ENT(args->stackP,AT_BASE, loadAddr);
-        PUSH_AUX_ENT(args->stackP,AT_ENTRY, header->entryPoint);
-        PUSH_AUX_ENT(args->stackP,AT_PHDR, args->process->memManager->start+header->phOffset);
-        PUSH_AUX_ENT(args->stackP,AT_PHENT, header->phEntrySize);
-        PUSH_AUX_ENT(args->stackP,AT_PHNUM, header->phEntries);
-        PUSH_AUX_ENT(args->stackP,AT_FLAGS, 0);
+        PUSH_AUX_ENT(args->stackP, AT_NULL, 0); /* Marker. */
+        PUSH_AUX_ENT(args->stackP, AT_PAGESZ, PAGE_SIZE);
+        PUSH_AUX_ENT(args->stackP, AT_BASE, loadAddr);
+        PUSH_AUX_ENT(args->stackP, AT_ENTRY, header->entryPoint);
+        PUSH_AUX_ENT(args->stackP, AT_PHDR, args->process->memManager->start+header->phOffset);
+        PUSH_AUX_ENT(args->stackP, AT_PHENT, header->phEntrySize);
+        PUSH_AUX_ENT(args->stackP, AT_PHNUM, header->phEntries);
+        PUSH_AUX_ENT(args->stackP, AT_FLAGS, 0);
 
         /* Seperate argv and the auxillary entries table */