Changeset 1074 in MondoRescue for trunk/mondo/src/lib/mr_conf.c

Timestamp:

Jan 25, 2007, 4:18:12 PM (17 years ago)

Author:

Bruno Cornec

Message:

This version of trunk desn't seg fault on mr_msg anymore.
Still not ready for 3.0.0 but improvements ongoing

File:

• trunk/mondo/src/lib/mr_conf.c (modified) (9 diffs)

trunk/mondo/src/lib/mr_conf.c

@@ -34 +34 @@
 #define MRCONF_OPEN_OPENED          0xA
 #define MRCONF_CALL_BUT_NOT_OPEN    0xB
+#define MRCONF_STRING_QUOTE         0xC
 
 /*setting flags*/
@@ -56 +57 @@
 #define MRCONF_STR_CLOSE_BUT_NOT_OPEN _("attempt to close mr_conf but it has not been opened yet")
 #define MRCONF_STR_CALL_BUT_NOT_OPEN _("attempt to use mr_conf when it has not been opened yet")
+#define MRCONF_STR_STRING_QUOTE     _("string should be surrounded by quotes")
 
 /*Flags of internal state*/
@@ -66 +68 @@
 static size_t mr_conf_filesize(const char *name);
 static void mr_conf_error_msg(int error_code, const char *add_line);
-static void mr_conf_remove_comments();
+static void mr_conf_remove_comments(void);
 static int mr_conf_check_int_flag(const int flag);
 static void mr_conf_set_int_flag(const int flag);
@@ -112 +114 @@
 
     /*allocate memory for the buffers */
-    buffer = (char *) malloc(sizeof(char) * (length + 1));
+    buffer = (char *) mr_malloc(sizeof(char) * (length + 1));
 
     if (buffer == NULL) {
@@ -139 +141 @@
 
 /*release all memory and prepare to the next possiable config file*/
-void mr_conf_close() {
+void mr_conf_close(void) {
     /* if not opened => error */
     if (!mr_conf_check_int_flag(MRCONF_INTFLAG_OPEN)) {
@@ -233 +235 @@
     mr_asprintf(&q, p);
 
+    if (*p != '"') {
+        mr_conf_error_msg(MRCONF_STRING_QUOTE, "");
+        return (NULL);
+    }
+    p++;
+
     /* trunk at first \n */
     r = index(q,'\n');
+    r--;
+    if (*r != '"') {
+        mr_conf_error_msg(MRCONF_STRING_QUOTE, "");
+        return (NULL);
+    }
+    r--;
 
     size = r-q+1;
     /*copy filtered data to the buffer */
-    ret = (char *) malloc(sizeof(char) * (size));
+    ret = (char *) mr_malloc(sizeof(char) * (size));
     if (ret == NULL) {
         mr_conf_error_msg(MRCONF_ALLOC_FAILED, "");
@@ -249 +263 @@
     }
 
-    ret[i] = (char) 0;      /*and set its length */
+    ret[i] = (char) 0;      /* and set its length */
     mr_free(q);
 
@@ -278 +292 @@
     }
     /* k is new buffer length now */
-    tmp_buf = (char *) malloc(sizeof(char) * (k + 1));
+    tmp_buf = (char *) mr_malloc(sizeof(char) * (k + 1));
     if (tmp_buf == NULL) {
         mr_conf_error_msg(MRCONF_ALLOC_FAILED, "");
@@ -371 +385 @@
             break;
 
+        case MRCONF_STRING_QUOTE:
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
+            break;
+
         default:
             mr_msg(1,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);