mirror of
https://github.com/kichikuou/xsystem35-sdl2.git
synced 2026-09-24 23:48:04 +03:00
This resolves issues where saving to and loading from paths with
subdirectories (e.g., "Save\file.asd") would fail.
The original problems were:
1. Writing failure: A path mismatch between directory creation in
commandQE and file writing in fc_open.
2. Loading failure: fc_search could not handle paths containing
directory separators, preventing saved files in subdirectories from
being found.
This commit addresses these issues with the following changes:
- fc_open now automatically creates parent directories when writing a
file.
- fc_search is updated to support two modes:
- It performs a case-insensitive search for simple filenames
(preserving original behavior).
- It performs a case-sensitive existence check for full paths.
Fixes #74.
249 lines
5.4 KiB
C
249 lines
5.4 KiB
C
/*
|
|
* filecheck.c save/load file existance and kanjicode check
|
|
*
|
|
* Copyright (C) 1997-1998 Masaki Chikama (Wren) <chikama@kasumi.ipl.mech.nagoya-u.ac.jp>
|
|
* 1998- <masaki-c@is.aist-nara.ac.jp>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
/* $Id: filecheck.c,v 1.5 2006/04/21 16:40:48 chikama Exp $ */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
#ifdef _WIN32
|
|
#include <direct.h>
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include "filecheck.h"
|
|
|
|
static char *saveDataPath;
|
|
|
|
static char *get_fullpath(const char* dir, const char *filename) {
|
|
char *fn = malloc(strlen(filename) + strlen(dir) + 3);
|
|
if (fn == NULL) {
|
|
return NULL;
|
|
}
|
|
strcpy(fn, dir);
|
|
strcat(fn, "/");
|
|
strcat(fn, filename);
|
|
return fn;
|
|
}
|
|
|
|
#ifdef _WIN32
|
|
|
|
static int make_dir(const char *path)
|
|
{
|
|
wchar_t wpath[PATH_MAX + 1];
|
|
if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, path, -1, wpath, PATH_MAX + 1)) {
|
|
errno = EILSEQ;
|
|
return -1;
|
|
}
|
|
return _wmkdir(wpath);
|
|
}
|
|
|
|
#else
|
|
#define make_dir(path) mkdir(path, S_IRWXU)
|
|
#endif
|
|
|
|
// Adapted from http://stackoverflow.com/a/2336245/119527
|
|
int mkdir_p(const char *path_utf8)
|
|
{
|
|
const size_t len = strlen(path_utf8);
|
|
char path[PATH_MAX];
|
|
char *p;
|
|
|
|
errno = 0;
|
|
|
|
// Copy string so its mutable
|
|
if (len > sizeof(path)-1) {
|
|
errno = ENAMETOOLONG;
|
|
return -1;
|
|
}
|
|
strcpy(path, path_utf8);
|
|
|
|
// Iterate the string
|
|
for (p = path + 1; *p; p++) {
|
|
if (*p == '/') {
|
|
// Temporarily truncate
|
|
*p = '\0';
|
|
|
|
if (make_dir(path) != 0) {
|
|
if (errno != EEXIST)
|
|
return -1;
|
|
}
|
|
|
|
*p = '/';
|
|
}
|
|
}
|
|
|
|
if (make_dir(path) != 0) {
|
|
if (errno != EEXIST)
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* list up file in current directory */
|
|
/* name : save/load directory */
|
|
void fc_init(const char *name) {
|
|
mkdir_p(name);
|
|
saveDataPath = strdup(name);
|
|
}
|
|
|
|
#ifdef _WIN32
|
|
|
|
FILE *fopen_utf8(const char *path_utf8, char type) {
|
|
wchar_t wpath[PATH_MAX + 1];
|
|
if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, path_utf8, -1, wpath, PATH_MAX + 1))
|
|
return NULL;
|
|
return _wfopen(wpath, type == 'r' ? L"rb" : L"wb");
|
|
}
|
|
|
|
char *fc_get_path(const char *fname_utf8) {
|
|
return get_fullpath(saveDataPath, fname_utf8);
|
|
}
|
|
|
|
bool fc_exists(const char *fname_utf8)
|
|
{
|
|
char *path = fc_get_path(fname_utf8);
|
|
wchar_t wpath[PATH_MAX + 1];
|
|
bool result = false;
|
|
if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, path, -1, wpath, PATH_MAX + 1)) {
|
|
result = _waccess(wpath, F_OK) != -1;
|
|
}
|
|
free(path);
|
|
return result;
|
|
}
|
|
|
|
FILE *fc_open(const char *fname_utf8, char type) {
|
|
char *path = fc_get_path(fname_utf8);
|
|
if (type == 'w') {
|
|
// Ensure the directory exists
|
|
char *p = strrchr(path, '/');
|
|
if (p) {
|
|
*p = '\0';
|
|
mkdir_p(path);
|
|
*p = '/';
|
|
}
|
|
}
|
|
FILE *fp = fopen_utf8(path, type);
|
|
if (!fp && type == 'r') {
|
|
fp = fopen_utf8(fname_utf8, type);
|
|
}
|
|
free(path);
|
|
return fp;
|
|
}
|
|
|
|
#else // !_WIN32
|
|
|
|
static char *fc_search(const char *fname_utf8, const char *dir) {
|
|
// If path contains no directory separator, do case-insensitive search.
|
|
if (strchr(fname_utf8, '/') == NULL) {
|
|
DIR *d = opendir(dir);
|
|
if (d == NULL)
|
|
return NULL;
|
|
|
|
char *found = NULL;
|
|
struct dirent *entry;
|
|
while ((entry = readdir(d)) != NULL) {
|
|
if (strcasecmp(fname_utf8, entry->d_name) == 0) {
|
|
found = get_fullpath(dir, entry->d_name);
|
|
break;
|
|
}
|
|
}
|
|
closedir(d);
|
|
return found;
|
|
} else {
|
|
// If path contains directory separator, do case-sensitive existence check.
|
|
char *fullpath = get_fullpath(dir, fname_utf8);
|
|
if (access(fullpath, F_OK) == 0) {
|
|
return fullpath;
|
|
} else {
|
|
free(fullpath);
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
char *fc_get_path(const char *fname_utf8) {
|
|
char *path = fc_search(fname_utf8, saveDataPath);
|
|
if (path)
|
|
return path;
|
|
return get_fullpath(saveDataPath, fname_utf8);
|
|
}
|
|
|
|
bool fc_exists(const char *fname_utf8)
|
|
{
|
|
char *path = fc_get_path(fname_utf8);
|
|
bool result = access(path, F_OK) != -1;
|
|
free(path);
|
|
return result;
|
|
}
|
|
|
|
FILE *fc_open(const char *fname_utf8, char type) {
|
|
char *fullpath = fc_search(fname_utf8, saveDataPath);
|
|
if (!fullpath) {
|
|
if (type == 'r') {
|
|
fullpath = fc_search(fname_utf8, ".");
|
|
if (!fullpath)
|
|
return NULL;
|
|
} else {
|
|
fullpath = get_fullpath(saveDataPath, fname_utf8);
|
|
}
|
|
}
|
|
|
|
FILE *fp;
|
|
if (type == 'w') {
|
|
// Ensure the directory exists
|
|
char *p = strrchr(fullpath, '/');
|
|
if (p) {
|
|
*p = '\0';
|
|
mkdir_p(fullpath);
|
|
*p = '/';
|
|
}
|
|
fp = fopen(fullpath, "wb");
|
|
} else {
|
|
fp = fopen(fullpath, "rb");
|
|
}
|
|
free(fullpath);
|
|
return fp;
|
|
}
|
|
#endif // _WIN32
|
|
|
|
void fc_backup_oldfile(const char *filename) {
|
|
#ifndef __EMSCRIPTEN__
|
|
char *newname;
|
|
|
|
if (!filename) return;
|
|
newname = malloc(strlen(filename) + 3);
|
|
|
|
strcpy(newname, filename);
|
|
strcat(newname, ".");
|
|
rename(filename, newname);
|
|
|
|
free(newname);
|
|
#endif
|
|
}
|