diff options
author | Frans Kaashoek <[email protected]> | 2012-08-22 20:20:17 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2012-08-22 20:20:17 -0400 |
commit | 432acbaf9e8817e16026bfcaaa8bca0ba7c8a6f8 (patch) | |
tree | 0b107cc92179b5b936d36174ff5af87e8fd3eec8 /sysfile.c | |
parent | 4ce832ddd280a4cea36e16115ddeaea74213314e (diff) | |
parent | 9d59eb015141697da616a4b98ac27cf4269cd780 (diff) | |
download | xv6-labs-432acbaf9e8817e16026bfcaaa8bca0ba7c8a6f8.tar.gz xv6-labs-432acbaf9e8817e16026bfcaaa8bca0ba7c8a6f8.tar.bz2 xv6-labs-432acbaf9e8817e16026bfcaaa8bca0ba7c8a6f8.zip |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'sysfile.c')
-rw-r--r-- | sysfile.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +// +// File-system system calls. +// Mostly argument checking, since we don't trust +// user code, and calls into file.c and fs.c. +// + #include "types.h" #include "defs.h" #include "param.h" @@ -382,13 +388,13 @@ sys_exec(void) for(i=0;; i++){ if(i >= NELEM(argv)) return -1; - if(fetchint(proc, uargv+4*i, (int*)&uarg) < 0) + if(fetchint(uargv+4*i, (int*)&uarg) < 0) return -1; if(uarg == 0){ argv[i] = 0; break; } - if(fetchstr(proc, uarg, &argv[i]) < 0) + if(fetchstr(uarg, &argv[i]) < 0) return -1; } return exec(path, argv); |