X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=file.c;h=efd08e5a0f23ac78f9444312349de8779c8ce4d8;hp=4b7872a4050d8f38f51e6b83345ac70791358333;hb=HEAD;hpb=0bbc23a37289ca20b8681229ccf74edfb6261d4e

diff --git a/file.c b/file.c
index 4b7872a..5f6204d 100644
--- a/file.c
+++ b/file.c
@@ -26,14 +26,46 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 
+#ifdef WIN32
+
+#define DATA_DIR "data\\"
+
+char *
+add_data_path(char *filename)
+{
+	char *s;
+	if(!filename) return filename;
+	s = malloc(sizeof(DATA_DIR)+strlen(filename));
+	if(s) {
+		strcpy(s, DATA_DIR);
+		strcpy(s+sizeof(DATA_DIR)-1, filename);
+	}
+	return s;
+}
+
+bool
+find_files(void)
+{
+	return true;
+}
+
+FILE *
+open_score_file(char *mode)
+{
+	return fopen("scores", mode);
+}
+
+
+#else /* !WIN32 */
+
+
 char *g_data_dir;
 char *g_score_file;
-mode_t g_score_mask;
 
-char *
+static char *
 add_path(char *path, char *file)
 {
 	char *s;
@@ -45,7 +77,7 @@ add_path(char *path, char *file)
 	s = malloc(2+plen+flen);
 	if(!s) return NULL;
 	memcpy(s, path, plen);
-	s[plen] = PATH_SEPARATOR;
+	s[plen] = '/';
 	memcpy(s+plen+1, file, flen+1);
 	return s;
 }
@@ -56,47 +88,27 @@ add_data_path(char *filename)
 	return add_path(g_data_dir, filename);
 }
 
-#ifdef WIN32
-
-bool
-is_dir(char *dirname)
-{
-	WIN32_FILE_ATTRIBUTE_DATA buf;
-	if(!GetFileAttributesEx(dirname, GetFileExInfoStandard, &buf))
-		return false;
-	return buf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-}
-
-bool
-is_file(char *filename)
-{
-	WIN32_FILE_ATTRIBUTE_DATA buf;
-	if(!GetFileAttributesEx(filename, GetFileExInfoStandard, &buf))
-		return false;
-	return buf.dwFileAttributes & FILE_ATTRIBUTE_NORMAL;
-}
-
-#else /* !WIN32 */
-
-bool
+static bool
 is_dir(char *dirname)
 {
 	struct stat buf;
-	stat(dirname, &buf);
+	if(stat(dirname, &buf)) {
+		return false;
+	}
 	return S_ISDIR(buf.st_mode);
 }
 
-bool
+static bool
 is_file(char *filename)
 {
 	struct stat buf;
-	stat(filename, &buf);
+	if(stat(filename, &buf)) {
+		return false;
+	}
 	return S_ISREG(buf.st_mode);
 }
 
-#endif /* !WIN32 */
-
-bool
+static bool
 find_data_dir(void)
 {
 	int i;
@@ -109,17 +121,21 @@ find_data_dir(void)
 	for(i=0; i<3; i++) {
 		if(!data_options[i]) continue;
 		g_data_dir = strdup(data_options[i]);
-		if(is_dir(g_data_dir)) return true;
+		if(is_dir(g_data_dir)) {
+			char *s = add_path(g_data_dir, "b_variations.png");
+			if(s) if(is_file(s))
+				return true;
+		}
 	}
 
 	fprintf(stderr, "Can't find VoR data! Tried:\n");
 	for(i=0; i<3; i++) {
-		fprintf(stderr, "\t%s\n", data_options[i]);
+		if(data_options[i]) fprintf(stderr, "\t%s\n", data_options[i]);
 	}
 	return false;
 }
 
-bool
+static bool
 find_score_file(void)
 {
 	char *dir, *s;
@@ -131,8 +147,7 @@ find_score_file(void)
 	s = add_path(dir, ".vor-scores");
 	if(s) {
 		g_score_file = s;
-		g_score_mask = 0177;
-		return is_file(s);
+		return true;
 	} else return false;
 }
 
@@ -145,13 +160,8 @@ find_files(void)
 FILE *
 open_score_file(char *mode)
 {
-	mode_t old_mask;
-	FILE *f;
-
 	if(!g_score_file) return NULL;
-
-	old_mask = umask(g_score_mask);
-	f = fopen(g_score_file, mode);
-	umask(old_mask);
-	return f;
+	return fopen(g_score_file, mode);
 }
+
+#endif /* !WIN32 */