Changeset 1106 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

File:

• trunk/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (9 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -67 +67 @@
     /** int ****************************************************************/
     int i = 0;
-    int index = 0;
+    int idx = 0;
     int currline = 0;
     int items = 0;
@@ -103 +103 @@
             log_it("I don't know what this button does");
         } else {
-            index = find_next_free_index_in_disklist(disklist);
+            idx = find_next_free_index_in_disklist(disklist);
 
             items = disklist->entries;
             strcpy(disklist->el[items].device,
                    unallocated_raid_partitions->el[currline].device);
-            disklist->el[items].index = index;
+            disklist->el[items].index = idx;
             disklist->entries = ++items;
 
@@ -1733 +1733 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    mr_free(bkp_raidrec);
+    mr_free((void*) bkp_raidrec);
 #endif
 }
@@ -2259 +2259 @@
 
     /** int ***************************************************************/
-    int index = -1;
+    int idx = -1;
     int pos = 0;
 
@@ -2269 +2269 @@
     for (done = FALSE; !done;) {
         for (pos = 0;
-             pos < disklist->entries && disklist->el[pos].index <= index;
+             pos < disklist->entries && disklist->el[pos].index <= idx;
              pos++);
         if (pos >= disklist->entries) {
             done = TRUE;
         } else {
-            index = disklist->el[pos].index;
-        }
-    }
-    return (index + 1);
+            idx = disklist->el[pos].index;
+        }
+    }
+    return (idx + 1);
 }
 
@@ -2335 +2335 @@
                 char *isodir_path, bool nuke_me_please)
 {
+    char *value = NULL;
 
     /** initialize ********************************************************/
-
-    // %d no var ???
-    // log_it("%d - AAA - isodir_path = %s", isodir_path);
+    malloc_string(value);
+
     if (isodir_device == NULL) {
         mr_asprintf(&isodir_device, "/dev/");
@@ -2346 +2346 @@
         mr_asprintf(&isodir_path, "/");
     }
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        mr_free(isodir_device);
-        isodir_device = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
+    if (read_cfg_var(g_mondo_cfg_file, "nfs-server-path", value) == 0) {
+        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount", isodir_device);
+        mr_free(isodir_format);
         mr_asprintf(&isodir_format, "nfs");
         mr_free(isodir_path);
-        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
-    }
+        mr_asprintf(isodir_path, value);
+    }
+    mr_free(value);
+
     if (nuke_me_please) {
         return (TRUE);
@@ -2451 +2453 @@
  * Dummy function that proves that we can get to the point where Mondo is run.
  */
-void nuke_mode_dummy()
+void nuke_mode_dummy(void)
 {
 
@@ -2912 +2914 @@
                sizeof(struct list_of_disks));
     }
-    mr_free(bkp_raidrec);
-    mr_free(bkp_disklist);
-    mr_free(bkp_raidlist);
-    mr_free(unallocated_raid_partitions);
+    mr_free((void*) bkp_raidrec);
+    mr_free((void*) bkp_disklist);
+    mr_free((void*) bkp_raidlist);
+    mr_free((void*) unallocated_raid_partitions);
 }
 #endif