Changeset 1594 in MondoRescue for branches/stable/mondo/src/lib/mr_conf.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

• branches/stable/mondo/src/lib/mr_conf.c (modified) (3 diffs)

branches/stable/mondo/src/lib/mr_conf.c

@@ -192 +192 @@
 
 /*read integer number after string str in the current file*/
-int mr_conf_iread(const char *field_name) {
+char *mr_conf_iread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    int ret = 0;                /*return value */
+    char *p1 = NULL;            /*return field */
 
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        ret = atoi(p);
-        }
-    return ret;
+        mr_asprintf(&p1, "%d", p);
+        }
+    return p1;
 }
 
 /*read float/double number after string str in the current file*/
-double mr_conf_fread(const char *field_name) {
+char *mr_conf_fread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    double ret = 0.0;               /*return value */
+    char *p1 = NULL;            /*return field */
 
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        ret = atof(p);
-    }
-    return ret;
+        mr_asprintf(&p1, "%f", p);
+    }
+    return p1;
 }
 
@@ -265 +265 @@
 
 /*read boolean after string str in the current file*/
-bool mr_conf_bread(const char *field_name) {
+char *mr_conf_bread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    bool ret = FALSE;
+    char *p1 = NULL;                /*pointer to the field */
     
-    p = mr_conf_sread(field_name);
+    p = mr_conf_read(field_name);
     if (p != NULL) {
         /* match if yes/true/1 */
@@ -275 +275 @@
             (strncasecmp(p, "t" , (size_t)1) == 0) ||
             (strncasecmp(p, "1" , (size_t)1) == 0)) {
-            ret = TRUE;
-        }
-    }
-    return ret;
+            mr_asprintf(&p1, "%d", TRUE);
+        } else {
+            mr_asprintf(&p1, "%d", FALSE);
+        }
+    }
+    return p1;
+}
+
+/* Convert a string with decimal value of TRUE/FALSE in boolean */
+bool mr_atob(const char *str) {
+    bool ret = FALSE;
+    char *p = NULL;
+
+    mr_asprintf(&p, "%d", FALSE);
+    if (strcmp(str,p) != 0) {
+        ret = TRUE;
+    }
+    mr_free(p);
+    return(ret);
 }