mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-07-01 00:48:30 +02:00
Code Issues Releases Wiki Activity

Whitespace consistency for FileSystemUtils

Browse Source
This commit is contained in:
Ethan Lee 2020-05-31 19:43:10 -04:00
parent 21b6c22195
commit 43f1204407
1 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
desktop_version/src/FileSystemUtils.cpp
View File

@ -103,9 +103,12 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath)
} }
/* Mount the stock content last */ /* Mount the stock content last */
if (assetsPath) { if (assetsPath)
{
strcpy(output, assetsPath); strcpy(output, assetsPath);
} else { }
else
{
strcpy(output, PHYSFS_getBaseDir()); strcpy(output, PHYSFS_getBaseDir());
strcat(output, "data.zip"); strcat(output, "data.zip");
} }
@ -161,10 +164,14 @@ void FILESYSTEM_mount(const char *fname)
std::string path(PHYSFS_getRealDir(fname)); std::string path(PHYSFS_getRealDir(fname));
path += PHYSFS_getDirSeparator(); path += PHYSFS_getDirSeparator();
path += fname; path += fname;
if (!PHYSFS_mount(path.c_str(), NULL, 0)) { if (!PHYSFS_mount(path.c_str(), NULL, 0))
{
printf("Error mounting: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); printf("Error mounting: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
} else }
else
{
graphics.assetdir = path.c_str(); graphics.assetdir = path.c_str();
}
} }
void FILESYSTEM_unmountassets() void FILESYSTEM_unmountassets()
@ -175,17 +182,26 @@ void FILESYSTEM_unmountassets()
PHYSFS_unmount(graphics.assetdir.c_str()); PHYSFS_unmount(graphics.assetdir.c_str());
graphics.assetdir = ""; graphics.assetdir = "";
graphics.reloadresources(); graphics.reloadresources();
} else printf("Cannot unmount when no asset directory is mounted\n"); }
else
{
printf("Cannot unmount when no asset directory is mounted\n");
}
} }
void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem, void FILESYSTEM_loadFileToMemory(
size_t *len, bool addnull) const char *name,
{ unsigned char **mem,
if (strcmp(name, "levels/special/stdin.vvvvvv") == 0) { size_t *len,
bool addnull
) {
if (strcmp(name, "levels/special/stdin.vvvvvv") == 0)
{
// this isn't *technically* necessary when piping directly from a file, but checking for that is annoying // this isn't *technically* necessary when piping directly from a file, but checking for that is annoying
static std::vector<char> STDIN_BUFFER; static std::vector<char> STDIN_BUFFER;
static bool STDIN_LOADED = false; static bool STDIN_LOADED = false;
if (!STDIN_LOADED) { if (!STDIN_LOADED)
{
std::istreambuf_iterator<char> begin(std::cin), end; std::istreambuf_iterator<char> begin(std::cin), end;
STDIN_BUFFER.assign(begin, end); STDIN_BUFFER.assign(begin, end);
STDIN_BUFFER.push_back(0); // there's no observable change in behavior if addnull is always true, but not vice versa STDIN_BUFFER.push_back(0); // there's no observable change in behavior if addnull is always true, but not vice versa
@ -193,7 +209,8 @@ void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem,
} }
size_t length = STDIN_BUFFER.size() - 1; size_t length = STDIN_BUFFER.size() - 1;
if (len != NULL) { if (len != NULL)
{
*len = length; *len = length;
} }
@ -537,7 +554,12 @@ bool FILESYSTEM_openDirectory(const char *dname)
{ {
pid_t child; pid_t child;
// This const_cast is legal (ctrl-f "The statement" at https://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html // This const_cast is legal (ctrl-f "The statement" at https://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html
char* argv[3] = {const_cast<char*>(open_cmd), const_cast<char*>(dname), NULL}; char* argv[3] =
{
const_cast<char*>(open_cmd),
const_cast<char*>(dname),
NULL
};
posix_spawnp(&child, open_cmd, NULL, NULL, argv, environ); posix_spawnp(&child, open_cmd, NULL, NULL, argv, environ);
int status = 0; int status = 0;
waitpid(child, &status, 0); waitpid(child, &status, 0);