Fixes: vlp-17.

[vlp.git] / src / kernel / kernel.cpp

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index 3126480c8cf1f07f052f0feb639e101e15ace3db..e747d1e97083c559f5b94b84b3f4a581fa31030e 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -294,10 +294,11 @@ void QKernel::n_impl()
 void QKernel::LoadConfig(char * fname)
 {
   config_t cfg;
+  config_setting_t *setting;
   const char *str;
 
   /* Hack for checking if file exists without using external libs.*/
-  FILE * file = fopen(fname, "r");
+  FILE * file = fopen(fname, "rt");
   if (!file) {
     fprintf(stderr, "Error: Cannot load configuration file %s!\n", fname);
     exit(3);
@@ -307,7 +308,7 @@ void QKernel::LoadConfig(char * fname)
   config_init(&cfg);
   
   /* Read the file. If there is an error, report it and exit. */
-  if(!config_read(&cfg, file)) 
+  if(!config_read(&cfg, file))
   {
     fprintf(stderr, "%s! In file %s, line %d\n",
         config_error_text(&cfg),
@@ -318,8 +319,11 @@ void QKernel::LoadConfig(char * fname)
     exit(3);/* from original code. */
   }
 
-  if(!config_lookup_int(&cfg, "node_number", &NodeNumber))
-  {
+  setting = config_lookup(&cfg, "node_number");
+  if(setting) {
+    NodeNumber = config_setting_get_int(setting);
+  }
+  else {
     fprintf(stderr, "%s! In file %s, '%s' was not found.\n",
         "Warning",
         fname,
@@ -329,8 +333,9 @@ void QKernel::LoadConfig(char * fname)
     exit(3);
   }
   
-  if(config_lookup_string(&cfg, "type", &str)){
-    ConType = (strcmp(str, "explicit") == 0) ? 1 : 2;
+  setting = config_lookup(&cfg, "type");
+  if(setting) {
+    ConType = (strcmp(config_setting_get_string(setting), "explicit") == 0) ? 1 : 2;
   }
   else {
     fprintf(stderr, "%s! In file %s, '%s' was not found.\n",
@@ -339,9 +344,23 @@ void QKernel::LoadConfig(char * fname)
         "type");
   }
   
-  
-  if(config_lookup_string(&cfg, "host", &str)) {
-    ConnectList.append(new ConnectEntry((char*)str));
+  setting = config_lookup(&cfg, "host");
+  if(setting) {
+    switch(config_setting_type(setting)) {
+      case CONFIG_TYPE_STRING:/* TODO: Deprecated. Made for back compatibility. */
+        ConnectList.append(new ConnectEntry((char*)config_setting_get_string(setting)));
+        break;
+      case CONFIG_TYPE_ARRAY:
+        for (int i = 0; i < config_setting_length(setting); i++) {
+          ConnectList.append(new ConnectEntry((char*)config_setting_get_string_elem(setting, i)));
+        }
+        break;
+      default:
+        fprintf(stderr, "%s! In file %s, bad entry type for %s. Will not be read.\n",
+        "Error",
+        fname,
+        "host");
+    }
   }
   else {
     fprintf(stderr, "%s! In file %s, '%s' was not found.\n",
@@ -350,8 +369,9 @@ void QKernel::LoadConfig(char * fname)
         "host");
   }
   
-  if(config_lookup_string(&cfg, "progdir", &str)){
-    strncpy(progdir, str, 256);
+  setting = config_lookup(&cfg, "progdir");
+  if(setting){
+    strncpy(progdir, config_setting_get_string(setting), 256);
   }
   else {
     fprintf(stderr, "%s! In file %s, '%s' was not found.\n",
@@ -360,8 +380,9 @@ void QKernel::LoadConfig(char * fname)
         "progdir");
   }
   
-  if(config_lookup_string(&cfg, "homedir", &str)){
-    strncpy(HomeDir, str, 255);
+  setting = config_lookup(&cfg, "homedir");
+  if(setting) {
+    strncpy(HomeDir, config_setting_get_string(setting), 255);
   }
   else {
     fprintf(stderr, "%s! In file %s, '%s' was not found.\n",
@@ -892,9 +913,7 @@ void QKernel::SetMessages()
 void QKernel::SetOptions()
 {
   QDialog dlg(this,"Options",TRUE);
-  QFile *vlp_file;
   ConnectEntry *e;
-  char line[256];
   unsigned int i;
 
 
@@ -982,31 +1001,43 @@ void QKernel::SetOptions()
        dlg.resize( 400, 310 );
         if (dlg.exec())
    {
-    unlink("vlp.cfg");
-    vlp_file = new QFile("vlp.cfg");
-    vlp_file->open(IO_WriteOnly);
-    sprintf(line,"progdir=%s\n",progs->text().ascii());
-    vlp_file->writeBlock(line,strlen(line));
-    strcpy(progdir,progs->text());  
-    sprintf(line,"node_number=%d\n",atoi(nn->text()));
-    vlp_file->writeBlock(line,strlen(line));
+
+    config_t cfg;
+    config_setting_t *root, *setting;
+    config_init(&cfg);
+
+    root = config_root_setting(&cfg);
+    
+    setting = config_setting_add(root, "progdir", CONFIG_TYPE_STRING);
+    config_setting_set_string(setting, progs->text().ascii());
+    strcpy(progdir,progs->text());
+
+    setting = config_setting_add(root, "node_number", CONFIG_TYPE_INT);
+    config_setting_set_int(setting, atoi(nn->text()));
+    
+    setting = config_setting_add(root, "homedir", CONFIG_TYPE_STRING);
+    config_setting_set_string(setting, HomeDir);
+    
+    setting = config_setting_add(root, "type", CONFIG_TYPE_STRING);
     if ( exp->isChecked())
     {
-    sprintf(line,"type=explicit\n");
-    vlp_file->writeBlock(line,strlen(line));
-    for(i=0;i<connections->count();i++)
-     {
-      sprintf(line,"host=%s\n",connections->text(i).ascii());
-      vlp_file->writeBlock(line,strlen(line));
-     }
+      config_setting_set_string(setting, "explicit");
+      
+      config_setting_t *hosts = NULL;
+      hosts = config_setting_add(root, "host", CONFIG_TYPE_ARRAY);
+      for(i=0;i<connections->count();i++) {
+        setting = config_setting_add(hosts, NULL, CONFIG_TYPE_STRING);
+        config_setting_set_string(setting, connections->text(i).ascii());
+      }
+    }
+    else {
+      config_setting_set_string(setting, "register");
+    }
     
+    if(!config_write_file(&cfg, "vlp.cfg")) {
+      fprintf(stderr, "Error while writing to file: %s.\n", "vlp.cfg");
     }
-     else
-    { 
-    sprintf(line,"type=register\n");
-    vlp_file->writeBlock(line,strlen(line));
-    } 
-    vlp_file->close();
+    config_destroy(&cfg);
     };
 }