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

Revert "Merging in 1.0.2."

Browse Source 
This reverts commit 50cf3276e7.
This commit is contained in:
Geoffrey Challen
2017-01-09 22:52:13 -05:00
parent 50cf3276e7
commit e318e3171e
118 changed files with 3158 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
userland/testbin/badcall/driver.c
View File

@@ -121,16 +121,18 @@ int
create_testdir(void)
{
int rv;
int result;
rv = mkdir(TESTDIR, 0775);
if (rv<0) {
if (errno == ENOSYS) {
report_saw_enosys();
report_warnx("mkdir unimplemented; cannot run test");
report_skipped();
report_skipped(&result);
}
else {
report_warn("mkdir %s failed", TESTDIR);
report_aborted();
report_aborted(&result);
}
return -1;
}
@@ -198,20 +200,20 @@ menu(void)
{
int i;
for (i=0; ops[i].name; i++) {
printf("[%c] %-24s", ops[i].ch, ops[i].name);
tprintf("[%c] %-24s", ops[i].ch, ops[i].name);
if (i%2==1) {
printf("\n");
tprintf("\n");
}
}
if (i%2==1) {
printf("\n");
tprintf("\n");
}
printf("[1] %-24s", "asst1");
printf("[2] %-24s\n", "asst2");
printf("[3] %-24s", "asst3");
printf("[4] %-24s\n", "asst4");
printf("[*] %-24s", "all");
printf("[!] %-24s\n", "quit");
tprintf("[1] %-24s", "asst1");
tprintf("[2] %-24s\n", "asst2");
tprintf("[3] %-24s", "asst3");
tprintf("[4] %-24s\n", "asst4");
tprintf("[*] %-24s", "all");
tprintf("[!] %-24s\n", "quit");
}
static
@@ -231,7 +233,7 @@ runit(int op)
if (op=='*') {
for (i=0; ops[i].name; i++) {
printf("[%s]\n", ops[i].name);
tprintf("[%s]\n", ops[i].name);
ops[i].f();
}
return;
@@ -241,7 +243,7 @@ runit(int op)
k = op-'0';
for (i=0; ops[i].name; i++) {
if (ops[i].asst <= k) {
printf("[%s]\n", ops[i].name);
tprintf("[%s]\n", ops[i].name);
ops[i].f();
}
}
@@ -249,7 +251,7 @@ runit(int op)
}
if (op < LOWEST || op > HIGHEST) {
printf("Invalid request %c\n", op);
tprintf("Invalid request %c\n", op);
return;
}
@@ -261,12 +263,12 @@ main(int argc, char **argv)
{
int op, i, j;
printf("[%c-%c, 1-4, *, ?=menu, !=quit]\n", LOWEST, HIGHEST);
tprintf("[%c-%c, 1-4, *, ?=menu, !=quit]\n", LOWEST, HIGHEST);
if (argc > 1) {
for (i=1; i<argc; i++) {
for (j=0; argv[i][j]; j++) {
printf("Choose: %c\n",
tprintf("Choose: %c\n",
argv[i][j]);
runit(argv[i][j]);
}
@@ -275,12 +277,12 @@ main(int argc, char **argv)
else {
menu();
while (1) {
printf("Choose: ");
tprintf("Choose: ");
op = getchar();
if (op==EOF) {
break;
}
printf("%c\n", op);
tprintf("%c\n", op);
runit(op);
}
}