1 files changed, 34 insertions, 4 deletions

diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index b2310c80..162cce68 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -3,14 +3,23 @@
  */
 
 #include <curses.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef _win32
+#include <direct.h>
+#else
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
+
 #include "../../core/Messenger.h"
 #include "../../core/network.h"
 
+#include "configdir.h"
 #include "windows.h"
 
 extern ToxWindow new_prompt();
@@ -22,7 +31,10 @@ extern int add_req(uint8_t *public_key); // XXX
 
 /* Holds status of chat windows */
 char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-#define TOXICVER "0.1.0" //Will be moved to a -D flag later 
+
+#ifndef TOXICVER
+#define TOXICVER "NOVER" //Use the -D flag to set this
+#endif
 
 static ToxWindow windows[MAX_WINDOW_SLOTS];
 static ToxWindow* prompt;
@@ -37,7 +49,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
   wprintw(prompt->window, "\nFriend request from:\n");
 
   int i;
-  for (i = 0; i < 32; ++i) {
+  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
     wprintw(prompt->window, "%02x", public_key[i] & 0xff);
   }
 
@@ -331,9 +343,19 @@ int main(int argc, char *argv[])
 {
   int ch;
   int f_flag = 0;
-  char *filename = "data";
+  char *user_config_dir = get_user_config_dir();
+  char *filename;
+  int config_err = create_user_config_dir(user_config_dir);
+  if(config_err) {
+    filename = "data";
+  } else {
+    filename = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
+    strcpy(filename, user_config_dir);
+    strcat(filename, CONFIGDIR);
+    strcat(filename, "data");
+  }
+  
   ToxWindow* a;
-
   int i = 0;
   for (i = 0; i < argc; ++i) {
     if (argv[i] == NULL)
@@ -351,6 +373,7 @@ int main(int argc, char *argv[])
   init_term();
   init_tox();
   load_data(filename);
+  free(filename);
   init_windows();
   init_window_status();
 
@@ -360,6 +383,13 @@ int main(int argc, char *argv[])
                             "defaulting to 'data' for a keyfile...\n");
     attroff(COLOR_PAIR(3) | A_BOLD);
   }
+
+  if(config_err) {
+    attron(COLOR_PAIR(3) | A_BOLD);
+    wprintw(prompt->window, "Unable to determine configuration directory!\n"
+                            "defaulting to 'data' for a keyfile...\n");
+    attroff(COLOR_PAIR(3) | A_BOLD);
+  }
   
   while(true) {
     /* Update tox */