Changeset 1769 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

Timestamp:

Nov 6, 2007, 1:37:38 AM (16 years ago)

Author:

Bruno Cornec

Message:

Continue on configuration file items (compression)

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (5 diffs)

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -1294 +1294 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c bkpinfo->restore_path
- * - @c bkpinfo->zip_exe
+ * - @c bkpinfo->compression_tool
  * @param orig_bf_fname The original filename of the biggiefile.
  * @param biggiefile_number The number of the biggiefile (starting from 0).
@@ -1433 +1433 @@
     }
 
-    if (!bkpinfo->zip_exe[0]) {
+    if (!bkpinfo->compression_tool) {
         mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
     } else {
-        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
+        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->compression_tool,
                 file_to_openout, MONDO_LOGFILE);
     }
@@ -1758 +1758 @@
  * - @c bkpinfo->backup_media_type
  * - @c bkpinfo->media_device
- * - @c bkpinfo->zip_exe
+ * - @c bkpinfo->compression_tool
  * @param tarball_fname The filename of the afioball to restore.
  * @param current_tarball_number The number (starting from 0) of the fileset
@@ -1820 +1820 @@
             mr_asprintf(&executable, " -bz");
         } else {
-            mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(&executable, "-P %s -Z", bkpinfo->compression_tool);
         }
     }
@@ -2940 +2940 @@
     }
 
-    if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
-        if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
-            system("mount " MNT_CDROM);
-        }
-        bkpinfo->compression_level = 1;
-        g_current_media_number = 2;
-        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
-        bkpinfo->backup_media_type = dvd;
-        open_progress_form(_("Reassembling /dev/hda1"),
-                           _("Shark is a bit of a silly person."),
-                           _("Please wait. This may take some time."),
-                           "", 1999);
-        system("rm -Rf /tmp/*pih*");
-
-        malloc_string(tmp);
-        restore_a_biggiefile_from_CD(42, NULL, tmp);
-        mr_free(tmp);
-    }
-
     if (argc == 5 && strcmp(argv[1], "--common") == 0) {
         mr_conf->log_level = 6;