foxdos-org
/
foxdos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maybe fix mfs_travers?

This commit is contained in:
'mr software' 2023-10-29 00:03:39 -07:00
parent 39e58e033f
commit 5c0d3da6f2
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tool/mfstool.c
View File

@ -40,9 +40,13 @@ char** psplit(char* path, int* i) {
while(1) { while(1) {
while(*path == '/') path++; while(*path == '/') path++;
l = pstrlen(path, &x); l = pstrlen(path, &x);
if(l < 3 && *path == '.') {
if(path[1] == '.' && *i != 0) free(rpth[*i--]);
} else {
rpth[*i] = memcpy(malloc(l + 1), path, l); rpth[*i] = memcpy(malloc(l + 1), path, l);
rpth[(*i)++][l] = 0; rpth[(*i)++][l] = 0;
path += l + x; // prevent buffer overrun path += l + x; // prevent buffer overrun
}
if(!x) break; if(!x) break;
if(*i >= a) rpth = realloc(rpth, sizeof(char*)*(a += 4)); if(*i >= a) rpth = realloc(rpth, sizeof(char*)*(a += 4));
} }
@ -86,13 +90,14 @@ uint32_t mfs_traverse(int fd, uint32_t from, char* name) {
mothfs_file d, next; mothfs_file d, next;
int sz; int sz;
char** rpth = psplit(name, &sz); char** rpth = psplit(name, &sz);
uint32_t* ns = malloc(512);
int i = 0; int i = 0;
if(!strcmp(*rpth, "/")) { if(!strcmp(*rpth, "/")) {
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
read(fd, &d, 512); read(fd, &d, 512);
mothfs_header* e = &d; mothfs_header* e = (mothfs_header*)&d; // reuse buffer
from = e->reserved + e->abm + 1; from = e->reserved + e->abm + 1;
i++; i++;
} }
@ -102,11 +107,11 @@ uint32_t mfs_traverse(int fd, uint32_t from, char* name) {
read(fd, &d, 512); read(fd, &d, 512);
switch(d.type) { switch(d.type) {
case 0: // file case 0: // file
r = strcmp(rpth[sz - 1], "/") ? from : 0; r = strcmp(rpth[sz - 1], "/") ? from : 0; // fail if last element of path is a /
if(sz - !strcmp(rpth[sz - 1], "/") - 1 != i) r = 0; // TODO does this line even work if(sz - !strcmp(rpth[sz - 1], "/") - 1 != i) r = 0; // TODO does this work. fail if the current element is not the last one, excluding a possible "/"
goto ret; goto ret;
break; break;
case 1: case 1: // directory
uint32_t* sp = d.data + 121; uint32_t* sp = d.data + 121;
for(int c = 0; c < 121; c++) { for(int c = 0; c < 121; c++) {
if(!d.data[c]) { if(!d.data[c]) {
@ -116,12 +121,15 @@ uint32_t mfs_traverse(int fd, uint32_t from, char* name) {
lseek(fd, ((uint64_t)d.data[c]) << 9, SEEK_SET); lseek(fd, ((uint64_t)d.data[c]) << 9, SEEK_SET);
read(fd, &next, 512); read(fd, &next, 512);
if(nmatch(next.name, rpth[i])) { if(nmatch(next.name, rpth[i])) {
from = d.data[c];
// TODO set r if last element // TODO set r if last element
if(i == sz - 1 - !strcmp(rpth[sz - 1], "/")) {
r = d.data[c];
goto ret;
}
from = d.data[c];
break; break;
} }
} // else check linked sector } // else check linked sector:
uint32_t* ns = malloc(512); // TODO ns is never freed
cls: lseek(fd, ((uint64_t)(*sp)) << 9, SEEK_SET); cls: lseek(fd, ((uint64_t)(*sp)) << 9, SEEK_SET);
read(fd, ns, 512); read(fd, ns, 512);
for(int c = 0; c < 127; c++) { for(int c = 0; c < 127; c++) {
@ -132,11 +140,15 @@ uint32_t mfs_traverse(int fd, uint32_t from, char* name) {
lseek(fd, ((uint64_t)d.data[c]) << 9, SEEK_SET); lseek(fd, ((uint64_t)d.data[c]) << 9, SEEK_SET);
read(fd, &next, 512); read(fd, &next, 512);
if(nmatch(next.name, rpth[i])) { if(nmatch(next.name, rpth[i])) {
from = d.data[c];
// TODO set r if last element // TODO set r if last element
if(i == sz - 1 - !strcmp(rpth[sz - 1], "/")) {
r = d.data[c];
goto ret;
}
from = d.data[c];
break; break;
} }
} // else go to next linked sector } // else go to next linked sector:
sp = ns + 127; sp = ns + 127;
goto cls; goto cls;
break; break;
@ -145,6 +157,7 @@ uint32_t mfs_traverse(int fd, uint32_t from, char* name) {
ret: for(; i < sz; i++) free(rpth[i]); ret: for(; i < sz; i++) free(rpth[i]);
free(rpth); free(rpth);
free(ns);
return r; return r;
} }