Changeset 1434 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix the function process_the_s_switch
Still improving conf file handling

Location:

branches/stable/mondo/src/mondoarchive

Files:

• mondo-cli.c (modified) (2 diffs)
• mondoarchive.c (modified) (1 diff)

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;