Changeset 1106 in MondoRescue for trunk/mondo/src/common/libmondo-tools.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/common/libmondo-tools.c (modified) (3 diffs)

trunk/mondo/src/common/libmondo-tools.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
+
 #include "mondostructures.h"
 #include "libmondo-tools.h"
@@ -362 +364 @@
     int rdsiz_MB;
     char *iso_path = NULL;
+    FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -592 +595 @@
                  bkpinfo->isodir);
         log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
+        iso_dev = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-        log_it("res of it = %s", tmp);
-        mr_asprintf(&tmp1, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp1, tmp);
-        mr_free(tmp1);
+        log_it("res of it = %s", iso_dev);
+
+        fd1 = mr_fopen(MONDORESTORECFG, "a");
+        mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
 
         mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
-                 tmp);
-        mr_free(tmp);
+                 iso_dev);
+        mr_free(iso_dev);
+
         log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
+        iso_mnt = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-        log_it("res of it = %s", tmp);
-
-        mr_asprintf(&tmp1, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp1, tmp);
-        mr_free(tmp1);
-
-        log_it("isomnt: %s, %d", tmp, strlen(tmp));
-        if (strlen(bkpinfo->isodir) < strlen(tmp)) {
-            mr_asprintf(&iso_path, " ");
-        } else {
-            mr_asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp));
-        }
-        mr_free(tmp);
-
-        mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_path);
-        mr_free(tmp);
+
+        log_it("res of it = %s", iso_mnt);
+        mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
+        log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
+
+        mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir);
+        if (strlen(iso_tmp) >= strlen(iso_mnt)) {
+            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+        }
+        mr_free(iso_tmp);
+        mr_free(iso_mnt);
+
         log_it("isodir: %s", iso_path);
+        mr_fprintf(fd1, "isodir %s\n", iso_path);
         mr_free(iso_path);
-        mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->prefix);
+
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-        mr_free(tmp);
-/* End patch */
+        mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+
+        mr_fclose(fd1);
     }                           // end of iso code