1 files changed, 18 insertions, 5 deletions

diff --git a/src/env.c b/src/env.c
index d13642f..282bc8f 100644
--- a/src/env.c
+++ b/src/env.c
@@ -4,6 +4,16 @@ bool initialized_env = false;
 char *tabledir;
 
 void
+mymkdir(char *d, int m)
+{
+#ifdef _WIN32
+        mkdir(d);
+#else
+        mkdir(d, m);
+#endif
+}
+
+void
 init_env()
 {
         char *nissydata = getenv("NISSYDATA");
@@ -15,21 +25,24 @@ init_env()
                 return;
 
         if (nissydata != NULL) {
-                tabledir = malloc(strlen(nissydata) * sizeof(char) + 20);
+                tabledir = malloc((strlen(nissydata) + 20) * sizeof(char));
                 strcpy(tabledir, nissydata);
         } else if (localdata != NULL) {
-                tabledir = malloc(strlen(localdata) * sizeof(char) + 20);
+                tabledir = malloc((strlen(localdata) + 20) * sizeof(char));
                 strcpy(tabledir, localdata);
                 strcat(tabledir, "/nissy");
         } else if (home != NULL) {
-                tabledir = malloc(strlen(home) * sizeof(char) + 20);
+                tabledir = malloc((strlen(home) + 20) * sizeof(char));
                 strcpy(tabledir, home);
                 strcat(tabledir, "/.nissy");
+        } else {
+                tabledir = malloc(20 * sizeof(char));
+                strcpy(tabledir, ".");
         }
 
-        mkdir(tabledir, 0777);
+        mymkdir(tabledir, 0777);
         strcat(tabledir, "/tables");
-        mkdir(tabledir, 0777);
+        mymkdir(tabledir, 0777);
 
         read  = !access(tabledir, R_OK);
         write = !access(tabledir, W_OK);