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

30
userland/testbin/dirseek/dirseek.c
View File

@@ -205,7 +205,7 @@ firstread(void)
errx(1, ".: File position after open not 0");
}
printf("Scanning directory...\n");
tprintf("Scanning directory...\n");
readit();
}
@@ -216,7 +216,7 @@ doreadat0(void)
{
off_t pos;
printf("Rewinding directory and reading it again...\n");
tprintf("Rewinding directory and reading it again...\n");
pos = lseek(dirfd, 0, SEEK_SET);
if (pos < 0) {
@@ -274,7 +274,7 @@ readallonebyone(void)
{
int i;
printf("Trying to read each entry again...\n");
tprintf("Trying to read each entry again...\n");
for (i=0; testfiles[i].name; i++) {
doreadone(i);
}
@@ -286,7 +286,7 @@ readallrandomly(void)
{
int n, i, x;
printf("Trying to read a bunch of entries randomly...\n");
tprintf("Trying to read a bunch of entries randomly...\n");
for (i=0; testfiles[i].name; i++);
n = i;
@@ -327,7 +327,7 @@ doreadateof(void)
off_t pos;
int i;
printf("Trying to read after going to EOF...\n");
tprintf("Trying to read after going to EOF...\n");
pos = lseek(dirfd, 0, SEEK_END);
if (pos<0) {
@@ -364,7 +364,7 @@ dobadreads(void)
off_t pos, pos2, eof;
int valid, i, k=0;
printf("Trying some possibly invalid reads...\n");
tprintf("Trying some possibly invalid reads...\n");
eof = lseek(dirfd, 0, SEEK_END);
if (eof < 0) {
@@ -394,13 +394,13 @@ dobadreads(void)
}
if (k>0) {
printf("Survived %d invalid reads...\n", k);
tprintf("Survived %d invalid reads...\n", k);
}
else {
printf("Couldn't find any invalid offsets to try...\n");
tprintf("Couldn't find any invalid offsets to try...\n");
}
printf("Trying to read beyond EOF...\n");
tprintf("Trying to read beyond EOF...\n");
pos2 = lseek(dirfd, eof + 1000, SEEK_SET);
if (pos2 < 0) {
/* this is ok */
@@ -414,10 +414,10 @@ static
void
dotest(void)
{
printf("Opening directory...\n");
tprintf("Opening directory...\n");
openit();
printf("Running tests...\n");
tprintf("Running tests...\n");
/* read the whole directory */
firstread();
@@ -443,7 +443,7 @@ dotest(void)
/* rewind again to make sure the invalid attempts didn't break it */
doreadat0();
printf("Closing directory...\n");
tprintf("Closing directory...\n");
closeit();
}
@@ -489,7 +489,7 @@ setup(void)
{
int i;
printf("Making directory %s...\n", TESTDIR);
tprintf("Making directory %s...\n", TESTDIR);
/* Create a directory */
if (mkdir(TESTDIR, 0775)<0) {
@@ -501,7 +501,7 @@ setup(void)
err(1, "%s: chdir", TESTDIR);
}
printf("Making some files...\n");
tprintf("Making some files...\n");
/* Populate it */
for (i=0; testfiles[i].name; i++) {
@@ -518,7 +518,7 @@ cleanup(void)
{
int i;
printf("Cleaning up...\n");
tprintf("Cleaning up...\n");
/* Remove the files */
for (i=0; testfiles[i].name; i++) {