Changeset 2464 for neercs/trunk/src/configuration.cTweet

Timestamp:

Jun 20, 2008, 2:09:15 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Last configuration file line was not handled
• Added 'screensaver_timeout' to configuration file

File:

• neercs/trunk/src/configuration.c (modified) (11 diffs)

neercs/trunk/src/configuration.c

@@ -30 +30 @@
     FILE *fp;
     struct stat st;
-    int size = 0, i = 0, total = 0, offset = 0;
+    int size = 0, i = 0, total = 0, offset = 0, l = 1;
     char *buffer = NULL;
 
@@ -53 +53 @@
     }
 
-    buffer = malloc(size);
+    buffer = malloc(size + 1);
     if(!buffer)
     {
@@ -65 +65 @@
         total+=i;
     }
+    buffer[total] = '\n';
 
     fclose(fp);
@@ -75 +76 @@
     {
         offset+=i;
+        l++;
     }
 
@@ -167 +169 @@
         line = realloc(line, l+1);
         line[l] = 0;
+
         get_key_value(line, option);
 
@@ -183 +186 @@
 int get_key_value(char *line, struct option *option)
 {
-    unsigned int i, o = 0, b=0;
+    unsigned int i, o = 0, b=0, end_spaces = 0;
     char *cur = NULL;
     option->value = NULL;
@@ -204 +207 @@
         if(line[i] == ' ' && !b) continue;
 
+
         if(line[i] == '=')
         {
             b = 0;
-            cur[o] = 0;
+            cur[o-end_spaces] = 0;
+            cur = realloc(cur, (o-end_spaces)+1);
             o = 0;
             option->key = cur;
@@ -214 +219 @@
         else
         {
+            if(line[i] == ' ') end_spaces++;
+            else end_spaces = 0;
+
             cur = realloc(cur, o+2);
             if(!cur)
@@ -223 +231 @@
             o++;
             b = 1;
+
         }
     }
@@ -228 +237 @@
     cur[o] = 0;
     option->value = cur;
+
+
     return 0;
 }
 
 
-#define IS_TOKEN(t) (!strncmp(option->key, t, strlen(t)))
-#define IS_VALUE(t) (!strncmp(option->value, t, strlen(t)))
+#define IS_TOKEN(t) (!strncmp(option->key, t, strlen(option->key)))
+#define IS_VALUE(t) (!strncmp(option->value, t, strlen(option->value)))
 
 
@@ -265 +276 @@
             else                                       screen_list->mini = 0;
 
-        } else if(IS_TOKEN("status"))
+        } else if(IS_TOKEN("status_bar"))
         {
             if     (IS_VALUE("true") || IS_VALUE("1")) screen_list->status = 1;
             else                                       screen_list->status = 0;
 
+        } else if(IS_TOKEN("screensaver_timeout"))
+        {
+            screen_list->screensaver_timeout = atoi(option->value) * 1000000;
+            if(!screen_list->screensaver_timeout) screen_list->screensaver_timeout-=1;
         } else
         {