Changeset 1434 in MondoRescue

Timestamp:

May 10, 2007, 1:38:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix the function process_the_s_switch
Still improving conf file handling

Location:

branches/stable/mondo

Files:

• distributions/conf/mondo.conf.dist (modified) (1 diff)
• src/lib/mr_conf.c (modified) (1 diff)
• src/mondoarchive/mondo-cli.c (modified) (2 diffs)
• src/mondoarchive/mondoarchive.c (modified) (1 diff)

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -31 +31 @@
 #
 #  ISO Burning CLI command options
-mondo_iso_burning_options="-eject dev=%s speed=%d fs=24m driveropts=burnfree"
+mondo_iso_burning_options="-eject dev=_DEVICE_ speed=_SPEED_ fs=24m driveropts=burnfree"
 
 #

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

@@ -392 +392 @@
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            mr_msg_int(0,line,file,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg_int(1,line,file,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_READING_FAILED:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            mr_msg_int(0,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg_int(1,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            mr_msg_int(0,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg_int(1,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
             break;
 
         case MRCONF_STRING_QUOTE:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
             break;
 
         default:
-            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -146 +146 @@
 {
     char *tmp = NULL;
-    char *p = NULL;
     char *q = NULL;
 
@@ -153 +152 @@
 
     bkpinfo->media_size = 0L;   /* dummy value */
-    for ( p = value; strchr(p, ','); p = strchr(p, ',') + 1) {
-        mr_asprintf(&tmp, p);
-        q = strchr(tmp, ',');
-        if (q != NULL) {
-            *q = '\0';
-        }
-        bkpinfo->media_size = friendly_sizestr_to_sizelong(tmp);
-        mr_free(tmp);
-
-        mr_msg(3, "media_size = %ld", bkpinfo->media_size);
-    }
+    mr_asprintf(&tmp, value);
+    q = strchr(tmp, ',');
+    if (q != NULL) {
+        *q = '\0';
+    }
+    bkpinfo->media_size = friendly_sizestr_to_sizelong(tmp);
+    mr_free(tmp);
+
+    mr_msg(3, "media_size = %ld", bkpinfo->media_size);
     if (bkpinfo->media_size <= 0L) {
         mr_msg(1, "You gave media an invalid size\n");

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -136 +136 @@
     
     char *p = NULL;
-    char *s = NULL;
-
-    s = mr_conf_sread("mondo_iso_creation_cmd");
-    fprintf(stderr,"s: %s\n",s);
-    mr_asprintf(&p, s);
+
+    mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_cmd"));
     mr_cnf->iso_creation_cmd = p;
     p = NULL;