minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed badcall execv testing logic

Browse Source
This commit is contained in:
Guru Prasad Srinivasa 2016-03-09 17:46:47 -05:00
parent 44d53d9306
commit 071595b8fb
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
userland/testbin/badcall/bad_execv.c
View File

@ -32,6 +32,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@ -106,8 +107,7 @@ exec_badprog(const void *prog, const char *desc)
report_begin(desc); report_begin(desc);
rv = execv(prog, args); rv = execv(prog, args);
result = report_check(rv, errno, EFAULT); result = report_check(rv, errno, EFAULT);
//XXX: Make sure this doesn't interfere with SIGNALLED/EXITED int code = result ? result : MAGIC_STATUS;
int code = MAGIC_STATUS | result;
exit(code); exit(code);
} }
@ -128,8 +128,7 @@ exec_emptyprog(void)
report_begin("exec the empty string"); report_begin("exec the empty string");
rv = execv("", args); rv = execv("", args);
result = report_check2(rv, errno, EINVAL, EISDIR); result = report_check2(rv, errno, EINVAL, EISDIR);
//XXX: Make sure this doesn't interfere with SIGNALLED/EXITED int code = result ? result : MAGIC_STATUS;
int code = MAGIC_STATUS | result;
exit(code); exit(code);
} }
@ -146,8 +145,7 @@ exec_badargs(void *args, const char *desc)
report_begin(desc); report_begin(desc);
rv = execv("/bin/true", args); rv = execv("/bin/true", args);
result = report_check(rv, errno, EFAULT); result = report_check(rv, errno, EFAULT);
//XXX: Make sure this doesn't interfere with SIGNALLED/EXITED int code = result ? result : MAGIC_STATUS;
int code = MAGIC_STATUS | result;
exit(code); exit(code);
} }
@ -170,8 +168,7 @@ exec_onearg(void *ptr, const char *desc)
report_begin(desc); report_begin(desc);
rv = execv("/bin/true", args); rv = execv("/bin/true", args);
result = report_check(rv, errno, EFAULT); result = report_check(rv, errno, EFAULT);
//XXX: Make sure this doesn't interfere with SIGNALLED/EXITED int code = result ? result : MAGIC_STATUS;
int code = MAGIC_STATUS | result;
exit(code); exit(code);
} }