1
0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-02 02:20:55 +11:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Virgil Dupras
48f371d380 emul: add sanity check for blkfs 2020-06-08 06:47:06 -04:00
Virgil Dupras
bcddfd461d blkpack: Remove usage of nonstandard d_type
The man page says it's not always available and it caused problems
under some FSes. The condition is not needed in the context of
blk/, let's scrap it.
2020-06-08 06:38:33 -04:00
2 changed files with 7 additions and 3 deletions

View File

@ -86,6 +86,13 @@ Machine* emul_init()
fprintf(stderr, "Can't open\n");
return NULL;
}
fseek(blkfp, 0, SEEK_END);
if (ftell(blkfp) < 100 * 1024) {
fclose(blkfp);
fprintf(stderr, "emul/blkfs too small, something's wrong, aborting.\n");
return NULL;
}
fseek(blkfp, 0, SEEK_SET);
// initialize memory
memset(m.mem, 0, 0x10000);
FILE *bfp = fopen(FBIN_PATH, "r");

View File

@ -29,9 +29,6 @@ int main(int argc, char *argv[])
if ((strcmp(ep->d_name, ".") == 0) || strcmp(ep->d_name, "..") == 0) {
continue;
}
if (ep->d_type != DT_REG) {
continue;
}
int blkid = atoi(ep->d_name);
if (blkid >= blkcnt) {
int newcnt = blkid+1;