Move some functions from savedata.c to filecheck.c

src/filecheck.c

@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
+#include "filecheck.h"
 #include "utfsjis.h"
 
 struct fnametable {
@@ -37,9 +38,21 @@ struct fnametable {
 #define FILEMAX 100 /* ???? */
 static struct fnametable tbl[FILEMAX];
 static int fnametable_cnt;
+static char *saveDataPath;
 static boolean initilized = FALSE;
 static boolean newfile_kanjicode_utf8 = TRUE;
 
+static char *get_fullpath(char *filename) {
+	char *fn = malloc(strlen(filename) + strlen(saveDataPath) + 3);
+	if (fn == NULL) {
+		return NULL;
+	}
+	strcpy(fn, saveDataPath);
+	strcat(fn, "/");
+	strcat(fn, filename);
+	return fn;
+}
+
 /* list up file in current directory */
 /*   name : save/load directory      */
 void fc_init(char *name) {
@@ -49,6 +62,7 @@ void fc_init(char *name) {
 	
 	initilized = FALSE;
 	
+	saveDataPath = strdup(name);
 	if (NULL == (dir = opendir(name))) {
 		return;
 	}
@@ -69,7 +83,7 @@ void fc_init(char *name) {
 }
 
 /* req must sjis */
-char *fc_search(char *req) {
+static char *fc_search(char *req) {
 	int i;
 	BYTE *b;
 	
@@ -99,7 +113,7 @@ char *fc_search(char *req) {
 }
 
 /* add new file to entry */
-char *fc_add(char *req) {
+static char *fc_add(char *req) {
 	BYTE *b;
 	
 	if (!initilized) return req;
@@ -123,6 +137,40 @@ char *fc_add(char *req) {
 	return b;
 }
 
+FILE *fc_open(char *filename, char type) {
+	char *fc = fc_search(filename);
+	char *fullpath;
+	FILE *fp;
+	
+	if (fc == NULL) { /* if file does not exist */
+		if (type == 'r') return NULL;
+		fc = fc_add(filename);
+	}
+	fullpath = get_fullpath(fc);
+	
+	if (type == 'w') {
+		fc_backup_oldfile(fullpath);
+		fp = fopen(fullpath, "w");
+	} else {
+		fp = fopen(fullpath, "r");
+	}
+	free(fullpath);
+	return fp;
+}
+
+void fc_backup_oldfile(char *filename) {
+	char *newname;
+	
+	if (!filename) return;
+	newname = malloc(strlen(filename) + 3);
+	
+	strcpy(newname, filename);
+	strcat(newname, ".");
+	rename(filename, newname);
+	
+	free(newname);
+}
+
 /* QE で新規ファイルをセーブする時のファイル名の漢字コード */
 void fc_set_default_kanjicode(int c) {
 	if (c == 0) {

src/filecheck.h

@@ -28,8 +28,8 @@
 #define FILENAME_KANJI_CODE_SJIS 1
 
 extern void fc_init(char *name);
-extern char *fc_search(char *req);
-extern char *fc_add(char *req);
+extern FILE *fc_open(char *filename, char type);
+extern void fc_backup_oldfile(char *filename);
 extern void fc_set_default_kanjicode(int c);
 
 #endif /* !__FILECHECK_H__ */

src/savedata.c

@@ -44,7 +44,6 @@
 
 /* セーブデータ */
 static char *saveDataFile[SAVE_MAXNUMBER];
-static char *saveDataPath;
 static int savefile_sysvar_cnt = SYSVAR_MAX;
 
 static void* saveStackInfo(Ald_stackHdr *head);
@@ -65,7 +64,6 @@ static void scheduleSync() {
 /* savefile がある directory を登録 */
 void save_set_path(char *path) {
 	nact->files.savedir = strdup(path);
-	saveDataPath = strdup(path);
 	fc_init(path);
 }
 
@@ -89,51 +87,6 @@ int save_delete_file(int index) {
 	return 1; /* とりあえず */
 }
 
-static char *get_fullpath(char *filename) {
-	char *fn = malloc(strlen(filename) + strlen(saveDataPath) + 3);
-	if (fn == NULL) {
-		return NULL;
-	}
-	strcpy(fn, saveDataPath);
-	strcat(fn, "/");
-	strcat(fn, filename);
-	return fn;
-}
-
-static void backup_oldfile(char *filename) {
-	char *newname;
-	
-	if (!filename) return;
-	newname = malloc(strlen(filename) + 3);
-	
-	strcpy(newname, filename);
-	strcat(newname, ".");
-	rename(filename, newname);
-	
-	free(newname);
-}
-
-static FILE *fileopen(char *filename, char type) {
-	char *fc = fc_search(filename);
-	char *fullpath;
-	FILE *fp;
-	
-	if (fc == NULL) { /* if file does not exist */
-		if (type == 'r') return NULL;
-		fc = fc_add(filename);
-	}
-	fullpath = get_fullpath(fc);
-	
-	if (type == 'w') {
-		backup_oldfile(fullpath);
-		fp = fopen(fullpath, "w");
-	} else {
-		fp = fopen(fullpath, "r");
-	}
-	free(fullpath);
-	return fp;
-}
-
 /* 指定ファイルへの変数の書き込み */
 int save_save_var_with_file(char *filename, int *start, int cnt) {
 	int status = 0, size, i;
@@ -155,7 +108,7 @@ int save_save_var_with_file(char *filename, int *start, int cnt) {
 #endif
 	}
 	
-	if (NULL == (fp = fileopen(filename, 'w'))) {
+	if (NULL == (fp = fc_open(filename, 'w'))) {
 		status = SAVE_SAVEERR; goto errexit;
 	}
 	
@@ -188,7 +141,7 @@ int save_load_var_with_file(char *filename, int *start, int cnt) {
 		return SAVE_LOADERR;
 	}
 	
-	if (NULL == (fp = fileopen(filename, 'r'))) {
+	if (NULL == (fp = fc_open(filename, 'r'))) {
 		status = SAVE_LOADERR; goto errexit;
 	}
 	
@@ -234,7 +187,7 @@ int save_save_str_with_file(char *filename, int start, int cnt) {
 	}
 	
 	
-	if (NULL == (fp = fileopen(filename, 'w'))) {
+	if (NULL == (fp = fc_open(filename, 'w'))) {
 		status = SAVE_SAVEERR; goto errexit;
 	}
 	size = tmp - _tmp;
@@ -261,7 +214,7 @@ int save_load_str_with_file(char *filename, int start, int cnt) {
 	char *tmp, *_tmp=NULL;
 	long filesize;
 	
-	if (NULL == (fp = fileopen(filename, 'r'))) {
+	if (NULL == (fp = fc_open(filename, 'r'))) {
 		return SAVE_LOADERR;
 	}
 	
@@ -509,7 +462,7 @@ int save_saveAll(int no) {
 	if (save_base == NULL)
 		return SAVE_SAVEERR;
 	
-	backup_oldfile(saveDataFile[no]);
+	fc_backup_oldfile(saveDataFile[no]);
 	fp = fopen(saveDataFile[no],"wb");
 	
 	if (fp == NULL)
@@ -786,7 +739,7 @@ static int saveGameData(int no, char *buf, int size) {
 	FILE *fp;
 	int status = SAVE_SAVEOK1;
 	
-	backup_oldfile(saveDataFile[no]);
+	fc_backup_oldfile(saveDataFile[no]);
 	fp = fopen(saveDataFile[no],"wb");
 	if (fp == NULL) {
 		return SAVE_SAVEERR;
@@ -808,7 +761,7 @@ BYTE* load_cg_with_file(char *filename, int *status){
 	
 	*status = 0;
 	
-	if (NULL == (fp = fileopen(filename, 'r'))) {
+	if (NULL == (fp = fc_open(filename, 'r'))) {
 		*status = SAVE_LOADERR; return NULL;
 	}