Apple-2-HW/aiie
1
0
Fork 0
mirror of https://github.com/JorjBauer/aiie.git synced 2024-11-26 11:49:19 +00:00
Code Issues Projects Releases Wiki Activity

*nix filesystem fixes

Browse Source
This commit is contained in:
Jorj Bauer 2020-07-07 21:20:22 -04:00
parent cf8fbd80f4
commit 58451e5dd7
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
nix/nix-filemanager.cpp
View File

@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <dirent.h> #include <dirent.h>
#include <stdlib.h>
#include "nix-filemanager.h" #include "nix-filemanager.h"
@ -202,13 +203,13 @@ int NixFileManager::write(int8_t fd, const void *buf, int nbyte)
// open, seek, write, close. // open, seek, write, close.
bool ret = false; bool ret = false;
int ffd = open(cachedNames[fd], O_WRONLY|O_CREAT, 0644); int ffd = ::open(cachedNames[fd], O_WRONLY|O_CREAT, 0644);
if (ffd != -1) { if (ffd != -1) {
if (lseek(ffd, pos, SEEK_SET) == -1) { if (::lseek(ffd, pos, SEEK_SET) == -1) {
close(ffd); close(ffd);
return -1; return -1;
} }
ret = write(ffd, buf, nbyte); ret = ::write(ffd, buf, nbyte);
if (ret != nbyte) { if (ret != nbyte) {
printf("error writing: %d\n", errno); printf("error writing: %d\n", errno);
} }
@ -223,32 +224,38 @@ int NixFileManager::write(int8_t fd, const void *buf, int nbyte)
int NixFileManager::read(int8_t fd, void *buf, int nbyte) int NixFileManager::read(int8_t fd, void *buf, int nbyte)
{ {
if (fd < 0 || fd >= numCached) if (fd < 0 || fd >= numCached) {
printf("no fd when reading? fd=%d\n", fd);
return -1; // FIXME: error handling? return -1; // FIXME: error handling?
}
if (cachedNames[fd][0] == 0) if (cachedNames[fd][0] == 0) {
return -1; // FIXME: error handling? return -1; // FIXME: error handling?
}
uint32_t pos = fileSeekPositions[fd]; off_t pos = fileSeekPositions[fd];
// open, seek, read, close. // open, seek, read, close.
bool ret = false; int ffd = ::open(cachedNames[fd], O_RDONLY);
int ffd = open(cachedNames[fd], O_RDONLY); if (ffd == -1) {
if (ffd != -1) { return -1;
if (lseek(ffd, pos, SEEK_SET) == -1) { }
if (::lseek(ffd, pos, SEEK_SET) != pos) {
close(ffd); close(ffd);
return -1; return -1;
} }
ret = read(ffd, buf, nbyte);
ssize_t rv = ::read(ffd, buf, nbyte);
if (rv != nbyte) {
close(ffd); close(ffd);
} return -1;
fileSeekPositions[fd]+=nbyte;
if (ret != nbyte) {
printf("ERROR reading from pos %d: %d\n", pos, errno);
} }
return ret; fileSeekPositions[fd]+=rv;
close(ffd);
return rv;
}; };
int NixFileManager::lseek(int8_t fd, int offset, int whence) int NixFileManager::lseek(int8_t fd, int offset, int whence)