Friction doesn't make sense any more, dropped that.

[vor.git] / file.c

diff --git a/file.c b/file.c
index 18193b2..45532d3 100644 (file)
--- a/file.c
+++ b/file.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "config.h"
-#include "file.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,9 +23,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "common.h"
+#include "config.h"
+#include "file.h"
+
 char *g_data_dir;
 char *g_score_file;
-mode_t g_score_mode;
+mode_t g_score_mask;
 
 char *
 add_path(char *filename)
@@ -80,17 +81,10 @@ find_data_dir(void)
 int
 find_score_file(void)
 {
-       g_score_file = add_path("scores");
-       g_score_mode = 0111;
-       if(is_file(g_score_file)) {
-               g_score_file = strdup(g_score_file);
-               return true;
-       }
-
        g_score_file = malloc(MAX_PATH_LEN);
        snprintf(g_score_file, MAX_PATH_LEN,
-                       "%s/.vor-high", getenv("HOME"));
-       g_score_mode = 0177;
+                       "%s/.vor-scores", getenv("HOME"));
+       g_score_mask = 0177;
        if(is_file(g_score_file)) return true;
 
        return false;
@@ -113,7 +107,7 @@ open_score_file(char *mode)
 
        if(!g_score_file) return f;
 
-       old_mask = umask(g_score_mode);
+       old_mask = umask(g_score_mask);
        f = fopen(g_score_file, mode);
 
        umask(old_mask);