summaryrefslogtreecommitdiffstats
path: root/src/userprog
diff options
context:
space:
mode:
Diffstat (limited to 'src/userprog')
-rw-r--r--src/userprog/build/fail2
-rw-r--r--src/userprog/process.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/userprog/build/fail b/src/userprog/build/fail
index e1df1c1..d20593f 100644
--- a/src/userprog/build/fail
+++ b/src/userprog/build/fail
@@ -1,5 +1,3 @@
-FAIL tests/userprog/args-none
-FAIL tests/userprog/args-dbl-space
FAIL tests/userprog/sc-bad-sp
FAIL tests/userprog/sc-bad-arg
FAIL tests/userprog/create-null
diff --git a/src/userprog/process.c b/src/userprog/process.c
index fadd14d..fbf2f50 100644
--- a/src/userprog/process.c
+++ b/src/userprog/process.c
@@ -352,9 +352,11 @@ load (const char *file_name, void (**eip) (void), void **esp)
esp_argv_entry++;
for (i = 0; i < argc - 1; i++) {
- // find next \0 in cmd
+ // step until a \0 is found
while (*(++esp_cmd) != '\0') {}
- *esp_argv_entry = esp_cmd + 1; // point to next character
+ // step over any ' '
+ while (*(++esp_cmd) == ' ') {}
+ *esp_argv_entry = esp_cmd; // point to next character
esp_argv_entry++;
}