Various Windows-specific fixes

sources/main.c

@@ -125,9 +125,7 @@
 void parse_args( int argc, const char **argv );
 void exit_if_server_already_running( void );
 
-static char *s_config_dir = NULL;
 static char *s_pid_file_path = NULL;
-static char *s_log_file_path = NULL;
 static void s_auth_callback(enc_http_delegate_t *a_delegate, void * a_arg);
 
 #ifdef __ANDROID__
@@ -146,36 +144,39 @@ int main( int argc, const char **argv )
 		S_SetExceptionFilter( );
 	#endif
 
-    {
 #ifdef _WIN32
-        s_sys_dir_path =dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
+    g_sys_dir_path = dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
 #elif DAP_OS_MAC
-        s_sys_dir_path =dap_strdup_printf( "/Applications/%s.app/Contents/Resources", dap_get_appname());
+    g_sys_dir_path = dap_strdup_printf("/Applications/%s.app/Contents/Resources", dap_get_appname());
 #elif DAP_OS_ANDROID
-        s_sys_dir_path = dap_strdup_printf("/storage/emulated/0/opt/%s",dap_get_appname());
+    g_sys_dir_path = dap_strdup_printf("/storage/emulated/0/opt/%s",dap_get_appname());
 #elif DAP_OS_UNIX
-        g_sys_dir_path =dap_strdup_printf("/opt/%s", dap_get_appname());
+    g_sys_dir_path = dap_strdup_printf("/opt/%s", dap_get_appname());
 #endif
-        g_sys_dir_path_len = strlen(g_sys_dir_path);
-
-        s_config_dir = dap_strdup_printf ("%s/etc", g_sys_dir_path );
-        s_log_file_path = dap_strdup_printf ("%s/var/log/%s.log", g_sys_dir_path,dap_get_appname());
-
-        char *l_log_dir_path = dap_strdup_printf ("%s/var/log", g_sys_dir_path);
-        dap_mkdir_with_parents( l_log_dir_path );
-        DAP_DELETE(l_log_dir_path);
-
-        if ( dap_common_init( dap_get_appname(), s_log_file_path ) != 0 ) {
-            printf( "Fatal Error: Can't init common functions module" );
+    {
+        char l_log_path[MAX_PATH] = {'\0'};
+        int l_pos = dap_sprintf(l_log_path, "%s/var/log", g_sys_dir_path);
+        dap_mkdir_with_parents(l_log_path);
+        dap_sprintf(l_log_path + l_pos, "/%s.log", dap_get_appname());
+        if (dap_common_init(dap_get_appname(), l_log_path) != 0) {
+            printf("Fatal Error: Can't init common functions module");
             return -2;
         }
-        dap_config_init( s_config_dir );
-        if ( (g_config = dap_config_open(dap_get_appname())) == NULL ) {
-            log_it( L_CRITICAL,"Can't init general configurations" );
-            return -1;
-        }
-        s_pid_file_path = dap_config_get_item_str_default( g_config,  "resources", "pid_path","/tmp") ;
     }
+
+    {
+        char l_config_dir[MAX_PATH] = {'\0'};
+        dap_sprintf(l_config_dir, "%s/etc", g_sys_dir_path);
+        dap_config_init(l_config_dir);
+    }
+
+    if ((g_config = dap_config_open(dap_get_appname())) == NULL ) {
+        log_it( L_CRITICAL,"Can't init general configurations" );
+        return -1;
+    }
+
+    s_pid_file_path = dap_config_get_item_str_default( g_config,  "resources", "pid_path","/tmp") ;
+
     log_it(L_DEBUG, "Parsing command line args");
     parse_args( argc, argv );
     #ifdef _WIN32