Merge branch 'feature-2854-1' into 'master'

Feature 2854 1

See merge request !65

sources/main_node_tool.c

@@ -367,7 +367,7 @@ int main(int argc, const char **argv)
  */
 static int s_init( int argc, const char **argv )
 {
-    dap_set_appname("cellframe-node-tool");
+    dap_set_appname("cellframe-node");
 
 #ifdef _WIN32
     s_sys_dir_path =dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
@@ -383,7 +383,9 @@ static int s_init( int argc, const char **argv )
     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());
 
-    dap_mkdir_with_parents( s_log_file_path );
+    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" );
@@ -449,7 +451,7 @@ static int s_init( int argc, const char **argv )
 
     uint16_t l_ca_folders_size = 0;
     char **l_ca_folders = dap_config_get_array_str(g_config, "resources", "ca_folders", &l_ca_folders_size);
-    memcpy(s_system_ca_dir + g_sys_dir_path_len, l_ca_folders[0], strlen(l_ca_folders[0]));
+    dap_stpcpy(s_system_ca_dir, l_ca_folders[0]);//memcpy(s_system_ca_dir, l_ca_folders[0], strlen(l_ca_folders[0]));
     return 0;
 }