mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-16 16:09:42 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/FileSystemUtils.cpp

528 lines
13 KiB
C++
Raw Normal View History

Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "FileSystemUtils.h"
#include <vector>
#include <string>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Implement command-line playtesting (#163)
2020-04-09 21:03:24 +02:00
#include <iterator>
#include <algorithm>
#include <iostream>
Messagebox on missing data.zip
2020-01-10 19:59:34 +01:00
#include <SDL.h>
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include <physfs.h>
Replace TiXmlDocument load and save functions by PHYSFS The TinyXml functions to load and save files don't properly support unicode file paths on Windows, so in order to support that properly, I saw no other option than to do the actual loading and saving via PHYSFS (or to use the Windows API on Windows and retain doc.LoadFile and doc.SaveFile on other OSes, but that'd be more complicated and unnecessary, we already have PHYSFS, right?). There are two new functions in FileSystemUtils: bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc) bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc) Any instances of doc.SaveFile(<FULL_PATH>) have been replaced by FILESYSTEM_saveTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc), where <FULL_PATH> included the full path to the saves or levels directory, and <VVVVVV_FOLDER_PATH> only includes the path relative to the VVVVVV directory. When loading a document, a TiXmlDocument used to be created with a full path in its constructor and doc.LoadFile() would then be called, now a TiXmlDocument is constructed with no path name and FILESYSTEM_loadTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc) is called.
2020-01-12 15:17:39 +01:00
#include "tinyxml.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#if defined(_WIN32)
#include <windows.h>
#include <shlobj.h>
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
#include <shellapi.h>
Use wide-char Windows API functions on Windows There's now a thin layer of UTF-16 around the WinAPI functions to get the path to the Documents folder and to create a new directory, so that account usernames with non-ASCII characters do not result in no VVVVVV folder being created or used.
2020-01-12 12:37:22 +01:00
int mkdir(char* path, int mode)
{
WCHAR utf16_path[MAX_PATH];
MultiByteToWideChar(CP_UTF8, 0, path, -1, utf16_path, MAX_PATH);
return CreateDirectoryW(utf16_path, NULL);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#define VNEEDS_MIGRATION (mkdirResult != 0)
Fix build on DragonFlyBSD
2020-04-20 15:41:11 +02:00
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include <sys/stat.h>
#include <limits.h>
#define VNEEDS_MIGRATION (mkdirResult == 0)
/* These are needed for PLATFORM_* crap */
#include <unistd.h>
#include <dirent.h>
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
#include <sys/types.h>
#include <sys/wait.h>
#include <spawn.h>
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#define MAX_PATH PATH_MAX
#endif
char saveDir[MAX_PATH];
char levelDir[MAX_PATH];
void PLATFORM_getOSDirectory(char* output);
void PLATFORM_migrateSaveData(char* output);
void PLATFORM_copyFile(const char *oldLocation, const char *newLocation);
Add -basedir option to specify base user directory (#154) Useful for maintaining multiple save files or for debugging
2020-02-09 00:49:03 +01:00
int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
char output[MAX_PATH];
int mkdirResult;
Add -basedir option to specify base user directory (#154) Useful for maintaining multiple save files or for debugging
2020-02-09 00:49:03 +01:00
const char* pathSep = PHYSFS_getDirSeparator();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
PHYSFS_init(argvZero);
Make sure all PhysFS calls are after init!
2020-01-12 16:52:42 +01:00
PHYSFS_permitSymbolicLinks(1);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
/* Determine the OS user directory */
Add -basedir option to specify base user directory (#154) Useful for maintaining multiple save files or for debugging
2020-02-09 00:49:03 +01:00
if (baseDir && strlen(baseDir) > 0)
{
strcpy(output, baseDir);
/* We later append to this path and assume it ends in a slash */
if (strcmp(std::string(1, output[strlen(output) - 1]).c_str(), pathSep) != 0)
{
strcat(output, pathSep);
}
}
else
{
PLATFORM_getOSDirectory(output);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
/* Create base user directory, mount */
mkdirResult = mkdir(output, 0777);
/* Mount our base user directory */
PHYSFS_mount(output, NULL, 1);
Replace TiXmlDocument load and save functions by PHYSFS The TinyXml functions to load and save files don't properly support unicode file paths on Windows, so in order to support that properly, I saw no other option than to do the actual loading and saving via PHYSFS (or to use the Windows API on Windows and retain doc.LoadFile and doc.SaveFile on other OSes, but that'd be more complicated and unnecessary, we already have PHYSFS, right?). There are two new functions in FileSystemUtils: bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc) bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc) Any instances of doc.SaveFile(<FULL_PATH>) have been replaced by FILESYSTEM_saveTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc), where <FULL_PATH> included the full path to the saves or levels directory, and <VVVVVV_FOLDER_PATH> only includes the path relative to the VVVVVV directory. When loading a document, a TiXmlDocument used to be created with a full path in its constructor and doc.LoadFile() would then be called, now a TiXmlDocument is constructed with no path name and FILESYSTEM_loadTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc) is called.
2020-01-12 15:17:39 +01:00
PHYSFS_setWriteDir(output);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
printf("Base directory: %s\n", output);
/* Create save directory */
strcpy(saveDir, output);
strcat(saveDir, "saves");
strcat(saveDir, PHYSFS_getDirSeparator());
mkdir(saveDir, 0777);
printf("Save directory: %s\n", saveDir);
/* Create level directory */
strcpy(levelDir, output);
strcat(levelDir, "levels");
strcat(levelDir, PHYSFS_getDirSeparator());
mkdirResult |= mkdir(levelDir, 0777);
printf("Level directory: %s\n", levelDir);
/* We didn't exist until now, migrate files! */
if (VNEEDS_MIGRATION)
{
PLATFORM_migrateSaveData(output);
}
/* Mount the stock content last */
Add -assets option to specify data.zip (#139) This is useful for distributions, which may not want to put data.zip in the same directory as the binary. This can't be distribution-specific due to the license ("Altered source/binary versions must be plainly marked as such, and must not be misrepresented as being the original software.").
2020-02-03 00:28:26 +01:00
if (assetsPath) {
strcpy(output, assetsPath);
} else {
strcpy(output, PHYSFS_getBaseDir());
strcat(output, "data.zip");
}
Messagebox on missing data.zip
2020-01-10 19:59:34 +01:00
if (!PHYSFS_mount(output, NULL, 1))
{
actually return an error when data.zip is missing We should return an error code when we can't find data.zip, just letting the program crash is a little crude.
2020-01-10 22:04:04 +01:00
puts("Error: data.zip missing!");
puts("You do not have data.zip!");
puts("Grab it from your purchased copy of the game,");
puts("or get it from the free Make and Play Edition.");
Messagebox on missing data.zip
2020-01-10 19:59:34 +01:00
SDL_ShowSimpleMessageBox(
SDL_MESSAGEBOX_ERROR,
"data.zip missing!",
"You do not have data.zip!"
"\n\nGrab it from your purchased copy of the game,"
Extra newline in data.zip message
2020-01-10 20:00:45 +01:00
"\nor get it from the free Make and Play Edition.",
Messagebox on missing data.zip
2020-01-10 19:59:34 +01:00
NULL
);
actually return an error when data.zip is missing We should return an error code when we can't find data.zip, just letting the program crash is a little crude.
2020-01-10 22:04:04 +01:00
return 0;
Messagebox on missing data.zip
2020-01-10 19:59:34 +01:00
}
Load gamecontrollerdb.txt if available
2020-01-17 18:43:42 +01:00
strcpy(output, PHYSFS_getBaseDir());
strcpy(output, "gamecontrollerdb.txt");
if (SDL_GameControllerAddMappingsFromFile(output) < 0)
{
printf("gamecontrollerdb.txt not found!\n");
}
actually return an error when data.zip is missing We should return an error code when we can't find data.zip, just letting the program crash is a little crude.
2020-01-10 22:04:04 +01:00
return 1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void FILESYSTEM_deinit()
{
PHYSFS_deinit();
}
char *FILESYSTEM_getUserSaveDirectory()
{
return saveDir;
}
char *FILESYSTEM_getUserLevelDirectory()
{
return levelDir;
}
Add a null terminator to loaded TinyXML files (#117) * Add a null terminator to loaded TinyXML files The TinyXML parse() function expect a C-like string, including terminator. When xml loading was changed, it loaded the file, but included no such thing. Thus, we load the file, then reallocate the memory so that we can insert a null terminator to it, before passing it to parse(). * Tweak TinyXML file loading Instead of first loading the file content into memory, then reallocate it to add a null pointer, add an argument to the file load function for whether to append a null terminator or not, defaulting to false. It still returns the length without the null pointer in case a length ptr is passed.
2020-01-24 21:35:46 +01:00
void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem,
size_t *len, bool addnull)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Implement command-line playtesting (#163)
2020-04-09 21:03:24 +02:00
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
static std::vector<char> STDIN_BUFFER;
static bool STDIN_LOADED = false;
if (!STDIN_LOADED) {
std::istreambuf_iterator<char> begin(std::cin), 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_LOADED = true;
}
size_t length = STDIN_BUFFER.size() - 1;
if (len != NULL) {
*len = length;
}
++length;
*mem = static_cast<unsigned char*>(malloc(length)); // STDIN_BUFFER.data() causes double-free
std::copy(STDIN_BUFFER.begin(), STDIN_BUFFER.end(), reinterpret_cast<char*>(*mem));
return;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
PHYSFS_File *handle = PHYSFS_openRead(name);
if (handle == NULL)
{
return;
}
PHYSFS_uint32 length = PHYSFS_fileLength(handle);
if (len != NULL)
{
*len = length;
}
Add a null terminator to loaded TinyXML files (#117) * Add a null terminator to loaded TinyXML files The TinyXML parse() function expect a C-like string, including terminator. When xml loading was changed, it loaded the file, but included no such thing. Thus, we load the file, then reallocate the memory so that we can insert a null terminator to it, before passing it to parse(). * Tweak TinyXML file loading Instead of first loading the file content into memory, then reallocate it to add a null pointer, add an argument to the file load function for whether to append a null terminator or not, defaulting to false. It still returns the length without the null pointer in case a length ptr is passed.
2020-01-24 21:35:46 +01:00
if (addnull)
{
*mem = (unsigned char *) malloc(length + 1);
Fix level editor not using LoadTiXmlDocument
2020-01-24 22:12:45 +01:00
(*mem)[length] = 0;
Add a null terminator to loaded TinyXML files (#117) * Add a null terminator to loaded TinyXML files The TinyXML parse() function expect a C-like string, including terminator. When xml loading was changed, it loaded the file, but included no such thing. Thus, we load the file, then reallocate the memory so that we can insert a null terminator to it, before passing it to parse(). * Tweak TinyXML file loading Instead of first loading the file content into memory, then reallocate it to add a null pointer, add an argument to the file load function for whether to append a null terminator or not, defaulting to false. It still returns the length without the null pointer in case a length ptr is passed.
2020-01-24 21:35:46 +01:00
}
else
{
*mem = (unsigned char*) malloc(length);
}
Handle errors from PHYSFS_readBytes() This fixes a bug where levels in the levels list duplicate if there's an invalid file (such as a folder) in the levels directory. It looks like it happens because we don't free the memory if PHYSFS_readBytes() encounters an error, even though we should. Then we get into Undefined Behavior territory and end up reusing memory, and here it just happens that previously, parsing the entire XML document for each level file was enough to make the loaded file pointer point to garbage that would fail the metadata check, but if we optimize it so we don't parse the entire XML document, it starts reusing memory instead.
2020-04-18 00:33:37 +02:00
int success = PHYSFS_readBytes(handle, *mem, length);
if (success == -1)
{
FILESYSTEM_freeMemory(mem);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
PHYSFS_close(handle);
}
void FILESYSTEM_freeMemory(unsigned char **mem)
{
free(*mem);
*mem = NULL;
}
Replace TiXmlDocument load and save functions by PHYSFS The TinyXml functions to load and save files don't properly support unicode file paths on Windows, so in order to support that properly, I saw no other option than to do the actual loading and saving via PHYSFS (or to use the Windows API on Windows and retain doc.LoadFile and doc.SaveFile on other OSes, but that'd be more complicated and unnecessary, we already have PHYSFS, right?). There are two new functions in FileSystemUtils: bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc) bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc) Any instances of doc.SaveFile(<FULL_PATH>) have been replaced by FILESYSTEM_saveTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc), where <FULL_PATH> included the full path to the saves or levels directory, and <VVVVVV_FOLDER_PATH> only includes the path relative to the VVVVVV directory. When loading a document, a TiXmlDocument used to be created with a full path in its constructor and doc.LoadFile() would then be called, now a TiXmlDocument is constructed with no path name and FILESYSTEM_loadTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc) is called.
2020-01-12 15:17:39 +01:00
bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc)
{
/* TiXmlDocument.SaveFile doesn't account for Unicode paths, PHYSFS does */
TiXmlPrinter printer;
doc->Accept(&printer);
PHYSFS_File* handle = PHYSFS_openWrite(name);
if (handle == NULL)
{
return false;
}
PHYSFS_writeBytes(handle, printer.CStr(), printer.Size());
PHYSFS_close(handle);
return true;
}
bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc)
{
/* TiXmlDocument.SaveFile doesn't account for Unicode paths, PHYSFS does */
unsigned char *mem = NULL;
Add a null terminator to loaded TinyXML files (#117) * Add a null terminator to loaded TinyXML files The TinyXML parse() function expect a C-like string, including terminator. When xml loading was changed, it loaded the file, but included no such thing. Thus, we load the file, then reallocate the memory so that we can insert a null terminator to it, before passing it to parse(). * Tweak TinyXML file loading Instead of first loading the file content into memory, then reallocate it to add a null pointer, add an argument to the file load function for whether to append a null terminator or not, defaulting to false. It still returns the length without the null pointer in case a length ptr is passed.
2020-01-24 21:35:46 +01:00
FILESYSTEM_loadFileToMemory(name, &mem, NULL, true);
Replace TiXmlDocument load and save functions by PHYSFS The TinyXml functions to load and save files don't properly support unicode file paths on Windows, so in order to support that properly, I saw no other option than to do the actual loading and saving via PHYSFS (or to use the Windows API on Windows and retain doc.LoadFile and doc.SaveFile on other OSes, but that'd be more complicated and unnecessary, we already have PHYSFS, right?). There are two new functions in FileSystemUtils: bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc) bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc) Any instances of doc.SaveFile(<FULL_PATH>) have been replaced by FILESYSTEM_saveTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc), where <FULL_PATH> included the full path to the saves or levels directory, and <VVVVVV_FOLDER_PATH> only includes the path relative to the VVVVVV directory. When loading a document, a TiXmlDocument used to be created with a full path in its constructor and doc.LoadFile() would then be called, now a TiXmlDocument is constructed with no path name and FILESYSTEM_loadTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc) is called.
2020-01-12 15:17:39 +01:00
if (mem == NULL)
{
return false;
}
Add support for Unicode rendering (#47) This uses utfcpp combined with a custom font, in the form of a PNG and text file. By default, the game acts exactly as it did before; custom fonts can be provided by third parties.
2020-01-31 19:25:37 +01:00
doc->Parse((const char*)mem, NULL, TIXML_ENCODING_UTF8);
Replace TiXmlDocument load and save functions by PHYSFS The TinyXml functions to load and save files don't properly support unicode file paths on Windows, so in order to support that properly, I saw no other option than to do the actual loading and saving via PHYSFS (or to use the Windows API on Windows and retain doc.LoadFile and doc.SaveFile on other OSes, but that'd be more complicated and unnecessary, we already have PHYSFS, right?). There are two new functions in FileSystemUtils: bool FILESYSTEM_saveTiXmlDocument(const char *name, TiXmlDocument *doc) bool FILESYSTEM_loadTiXmlDocument(const char *name, TiXmlDocument *doc) Any instances of doc.SaveFile(<FULL_PATH>) have been replaced by FILESYSTEM_saveTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc), where <FULL_PATH> included the full path to the saves or levels directory, and <VVVVVV_FOLDER_PATH> only includes the path relative to the VVVVVV directory. When loading a document, a TiXmlDocument used to be created with a full path in its constructor and doc.LoadFile() would then be called, now a TiXmlDocument is constructed with no path name and FILESYSTEM_loadTiXmlDocument(<VVVVVV_FOLDER_PATH>, &doc) is called.
2020-01-12 15:17:39 +01:00
FILESYSTEM_freeMemory(&mem);
return true;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
std::vector<std::string> FILESYSTEM_getLevelDirFileNames()
{
std::vector<std::string> list;
char **fileList = PHYSFS_enumerateFiles("/levels");
char **i;
std::string builtLocation;
for (i = fileList; *i != NULL; i++)
{
if (strcmp(*i, "data") == 0)
{
continue; /* FIXME: lolwut -flibit */
}
builtLocation = "levels/";
builtLocation += *i;
list.push_back(builtLocation);
}
PHYSFS_freeList(fileList);
return list;
}
void PLATFORM_getOSDirectory(char* output)
{
Invert the ifdef mess for getOSDirectory
2020-01-11 17:29:07 +01:00
#ifdef _WIN32
/* This block is here for compatibility, do not touch it! */
Use wide-char Windows API functions on Windows There's now a thin layer of UTF-16 around the WinAPI functions to get the path to the Documents folder and to create a new directory, so that account usernames with non-ASCII characters do not result in no VVVVVV folder being created or used.
2020-01-12 12:37:22 +01:00
WCHAR utf16_path[MAX_PATH];
SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, utf16_path);
WideCharToMultiByte(CP_UTF8, 0, utf16_path, -1, output, MAX_PATH, NULL, NULL);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
strcat(output, "\\VVVVVV\\");
#else
Invert the ifdef mess for getOSDirectory
2020-01-11 17:29:07 +01:00
strcpy(output, PHYSFS_getPrefDir("distractionware", "VVVVVV"));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#endif
}
void PLATFORM_migrateSaveData(char* output)
{
char oldLocation[MAX_PATH];
char newLocation[MAX_PATH];
char oldDirectory[MAX_PATH];
Fix build on DragonFlyBSD
2020-04-20 15:41:11 +02:00
#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
DIR *dir = NULL;
struct dirent *de = NULL;
DIR *subDir = NULL;
struct dirent *subDe = NULL;
char subDirLocation[MAX_PATH];
const char *homeDir = getenv("HOME");
if (homeDir == NULL)
{
/* Uhh, I don't want to get near this. -flibit */
return;
}
strcpy(oldDirectory, homeDir);
Fix indentation with ifdefs and FILESYSTEM_delete() Nested ifdefs have been indented one space accordingly, and FILESYSTEM_delete() has been changed to use a tab instead of 4 spaces.
2020-05-18 23:07:52 +02:00
#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
strcat(oldDirectory, "/.vvvvvv/");
Fix indentation with ifdefs and FILESYSTEM_delete() Nested ifdefs have been indented one space accordingly, and FILESYSTEM_delete() has been changed to use a tab instead of 4 spaces.
2020-05-18 23:07:52 +02:00
#elif defined(__APPLE__)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
strcat(oldDirectory, "/Documents/VVVVVV/");
Fix indentation with ifdefs and FILESYSTEM_delete() Nested ifdefs have been indented one space accordingly, and FILESYSTEM_delete() has been changed to use a tab instead of 4 spaces.
2020-05-18 23:07:52 +02:00
#endif
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
dir = opendir(oldDirectory);
if (!dir)
{
printf("Could not find directory %s\n", oldDirectory);
return;
}
printf("Migrating old savedata to new location...\n");
for (de = readdir(dir); de != NULL; de = readdir(dir))
{
if ( strcmp(de->d_name, "..") == 0 ||
strcmp(de->d_name, ".") == 0 )
{
continue;
}
#define COPY_SAVEFILE(name) \
else if (strcmp(de->d_name, name) == 0) \
{ \
strcpy(oldLocation, oldDirectory); \
strcat(oldLocation, name); \
strcpy(newLocation, output); \
strcat(newLocation, "saves/"); \
strcat(newLocation, name); \
PLATFORM_copyFile(oldLocation, newLocation); \
}
COPY_SAVEFILE("unlock.vvv")
COPY_SAVEFILE("tsave.vvv")
COPY_SAVEFILE("qsave.vvv")
#undef COPY_SAVEFILE
else if (strstr(de->d_name, ".vvvvvv.vvv") != NULL)
{
strcpy(oldLocation, oldDirectory);
strcat(oldLocation, de->d_name);
strcpy(newLocation, output);
strcat(newLocation, "saves/");
strcat(newLocation, de->d_name);
PLATFORM_copyFile(oldLocation, newLocation);
}
else if (strstr(de->d_name, ".vvvvvv") != NULL)
{
strcpy(oldLocation, oldDirectory);
strcat(oldLocation, de->d_name);
strcpy(newLocation, output);
strcat(newLocation, "levels/");
strcat(newLocation, de->d_name);
PLATFORM_copyFile(oldLocation, newLocation);
}
else if (strcmp(de->d_name, "Saves") == 0)
{
strcpy(subDirLocation, oldDirectory);
strcat(subDirLocation, "Saves/");
subDir = opendir(subDirLocation);
if (!subDir)
{
printf("Could not open Saves/ subdir!\n");
continue;
}
for (
subDe = readdir(subDir);
subDe != NULL;
subDe = readdir(subDir)
) {
#define COPY_SAVEFILE(name) \
(strcmp(subDe->d_name, name) == 0) \
{ \
strcpy(oldLocation, subDirLocation); \
strcat(oldLocation, name); \
strcpy(newLocation, output); \
strcat(newLocation, "saves/"); \
strcat(newLocation, name); \
PLATFORM_copyFile(oldLocation, newLocation); \
}
if COPY_SAVEFILE("unlock.vvv")
else if COPY_SAVEFILE("tsave.vvv")
else if COPY_SAVEFILE("qsave.vvv")
#undef COPY_SAVEFILE
}
}
}
#elif defined(_WIN32)
WIN32_FIND_DATA findHandle;
HANDLE hFind = NULL;
char fileSearch[MAX_PATH];
/* Same place, different layout. */
strcpy(oldDirectory, output);
/* In theory we don't need to worry about this, thanks case insensitivity!
sprintf(fileSearch, "%s\\Saves\\*.vvv", oldDirectory);
hFind = FindFirstFile(fileSearch, &findHandle);
if (hFind == INVALID_HANDLE_VALUE)
{
printf("Could not find directory %s\\Saves\\\n", oldDirectory);
}
else do
{
if ((findHandle.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
{
#define COPY_SAVEFILE(name) \
(strcmp(findHandle.cFileName, name) == 0) \
{ \
strcpy(oldLocation, oldDirectory); \
strcat(oldLocation, "Saves\\"); \
strcat(oldLocation, name); \
strcpy(newLocation, output); \
strcat(newLocation, "saves\\"); \
strcat(newLocation, name); \
PLATFORM_copyFile(oldLocation, newLocation); \
}
if COPY_SAVEFILE("unlock.vvv")
else if COPY_SAVEFILE("tsave.vvv")
else if COPY_SAVEFILE("qsave.vvv")
#undef COPY_SAVEFILE
}
} while (FindNextFile(hFind, &findHandle));
*/
sprintf(fileSearch, "%s\\*.vvvvvv", oldDirectory);
hFind = FindFirstFile(fileSearch, &findHandle);
if (hFind == INVALID_HANDLE_VALUE)
{
printf("Could not find directory %s\n", oldDirectory);
}
else do
{
if ((findHandle.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
{
strcpy(oldLocation, oldDirectory);
strcat(oldLocation, findHandle.cFileName);
strcpy(newLocation, output);
strcat(newLocation, "levels\\");
strcat(newLocation, findHandle.cFileName);
PLATFORM_copyFile(oldLocation, newLocation);
}
} while (FindNextFile(hFind, &findHandle));
#else
#error See PLATFORM_migrateSaveData
#endif
}
void PLATFORM_copyFile(const char *oldLocation, const char *newLocation)
{
char *data;
Handle return values from fread() and fwrite() in PLATFORM_copyFile() Whenever I compile with -O2, GCC gives me a warning that the return value of fread() is being ignored. Which is a fair point, it means that we're not doing proper error handling if something goes wrong. But I'm also going to check the return value of fwrite() for good measure. I believe that checking that this number is not equal to length is the way to catch all errors and output an error message accordingly. I didn't use ferror() or feof() mostly because I think it takes up too much code. Also an error from fwrite() only says "Warning" because I don't think there's much we can do if we don't fully write all bytes to the intended file.
2020-05-18 23:03:14 +02:00
size_t length, bytes_read, bytes_written;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
/* Read data */
FILE *file = fopen(oldLocation, "rb");
if (!file)
{
printf("Cannot open/copy %s\n", oldLocation);
return;
}
fseek(file, 0, SEEK_END);
length = ftell(file);
fseek(file, 0, SEEK_SET);
data = (char*) malloc(length);
Handle return values from fread() and fwrite() in PLATFORM_copyFile() Whenever I compile with -O2, GCC gives me a warning that the return value of fread() is being ignored. Which is a fair point, it means that we're not doing proper error handling if something goes wrong. But I'm also going to check the return value of fwrite() for good measure. I believe that checking that this number is not equal to length is the way to catch all errors and output an error message accordingly. I didn't use ferror() or feof() mostly because I think it takes up too much code. Also an error from fwrite() only says "Warning" because I don't think there's much we can do if we don't fully write all bytes to the intended file.
2020-05-18 23:03:14 +02:00
bytes_read = fread(data, 1, length, file);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
fclose(file);
Handle return values from fread() and fwrite() in PLATFORM_copyFile() Whenever I compile with -O2, GCC gives me a warning that the return value of fread() is being ignored. Which is a fair point, it means that we're not doing proper error handling if something goes wrong. But I'm also going to check the return value of fwrite() for good measure. I believe that checking that this number is not equal to length is the way to catch all errors and output an error message accordingly. I didn't use ferror() or feof() mostly because I think it takes up too much code. Also an error from fwrite() only says "Warning" because I don't think there's much we can do if we don't fully write all bytes to the intended file.
2020-05-18 23:03:14 +02:00
if (bytes_read != length)
{
printf("An error occurred when reading from %s\n", oldLocation);
free(data);
return;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
/* Write data */
file = fopen(newLocation, "wb");
if (!file)
{
printf("Could not write to %s\n", newLocation);
free(data);
return;
}
Handle return values from fread() and fwrite() in PLATFORM_copyFile() Whenever I compile with -O2, GCC gives me a warning that the return value of fread() is being ignored. Which is a fair point, it means that we're not doing proper error handling if something goes wrong. But I'm also going to check the return value of fwrite() for good measure. I believe that checking that this number is not equal to length is the way to catch all errors and output an error message accordingly. I didn't use ferror() or feof() mostly because I think it takes up too much code. Also an error from fwrite() only says "Warning" because I don't think there's much we can do if we don't fully write all bytes to the intended file.
2020-05-18 23:03:14 +02:00
bytes_written = fwrite(data, 1, length, file);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
fclose(file);
free(data);
/* WTF did we just do */
printf("Copied:\n\tOld: %s\n\tNew: %s\n", oldLocation, newLocation);
Handle return values from fread() and fwrite() in PLATFORM_copyFile() Whenever I compile with -O2, GCC gives me a warning that the return value of fread() is being ignored. Which is a fair point, it means that we're not doing proper error handling if something goes wrong. But I'm also going to check the return value of fwrite() for good measure. I believe that checking that this number is not equal to length is the way to catch all errors and output an error message accordingly. I didn't use ferror() or feof() mostly because I think it takes up too much code. Also an error from fwrite() only says "Warning" because I don't think there's much we can do if we don't fully write all bytes to the intended file.
2020-05-18 23:03:14 +02:00
if (bytes_written != length)
{
printf("Warning: an error occurred when writing to %s\n", newLocation);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
bool FILESYSTEM_openDirectoryEnabled()
{
Pull openDirectoryEnabled out of the openDirectory ifdefness
2020-04-18 17:37:28 +02:00
/* This is just a check to see if we're on a desktop or tenfoot setup.
* If you're working on a tenfoot-only build, add a def that always
* returns false!
*/
Bools are hard...
2020-04-18 17:38:27 +02:00
return !SDL_GetHintBoolean("SteamTenfoot", SDL_FALSE);
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
}
Pull openDirectoryEnabled out of the openDirectory ifdefness
2020-04-18 17:37:28 +02:00
#ifdef _WIN32
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
bool FILESYSTEM_openDirectory(const char *dname)
{
ShellExecute(NULL, "open", dname, NULL, NULL, SW_SHOWMINIMIZED);
return true;
}
Fix build on DragonFlyBSD
2020-04-20 15:41:11 +02:00
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
Fix FILESYSTEM_openDirectory command used on Haiku and *BSD Previously: - Linux: xdg-open - Everything else: open Now: - macOS and Haiku: open - Everything else: xdg-open This is all according to a comment by leo60228 in PR #203.
2020-05-14 22:46:57 +02:00
#if defined(__APPLE__) || defined(__HAIKU__)
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
const char* open_cmd = "open";
Fix FILESYSTEM_openDirectory command used on Haiku and *BSD Previously: - Linux: xdg-open - Everything else: open Now: - macOS and Haiku: open - Everything else: xdg-open This is all according to a comment by leo60228 in PR #203.
2020-05-14 22:46:57 +02:00
#else
const char* open_cmd = "xdg-open";
Add FILESYSTEM_openDirectory() and _openDirectoryEnabled() Have to add some includes and put these behind some ifdefs, of course. I'm pretty sure FreeBSD and OpenBSD and Haiku are POSIX enough that the "open" command will work on them, too. I would've loved to make FILESYSTEM_openDirectoryEnabled a simple bool instead of a function, but I ran into issues with putting it in the FileSystemUtils header file, so I'll just make it a function and call it a day.
2020-04-18 03:48:55 +02:00
#endif
extern "C" char** environ;
bool FILESYSTEM_openDirectory(const char *dname)
{
pid_t child;
// 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};
posix_spawnp(&child, open_cmd, NULL, NULL, argv, environ);
int status = 0;
waitpid(child, &status, 0);
return WIFEXITED(status) && WEXITSTATUS(status) == 0;
}
#else
bool FILESYSTEM_openDirectory(const char *dname)
{
return false;
}
#endif
Fix deletequick() and deletetele() not deleting their files The problem here is that we're directly using the C stdio library, instead of using PHYSFS's stuff. So I've added a function FILESYSTEM_delete() that does exactly that.
2020-04-26 22:22:26 +02:00
bool FILESYSTEM_delete(const char *name)
{
Fix indentation with ifdefs and FILESYSTEM_delete() Nested ifdefs have been indented one space accordingly, and FILESYSTEM_delete() has been changed to use a tab instead of 4 spaces.
2020-05-18 23:07:52 +02:00
return PHYSFS_delete(name) != 0;
Fix deletequick() and deletetele() not deleting their files The problem here is that we're directly using the C stdio library, instead of using PHYSFS's stuff. So I've added a function FILESYSTEM_delete() that does exactly that.
2020-04-26 22:22:26 +02:00
}
Reference in a new issue Copy permalink