Changeset 2771 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

Apr 22, 2011, 1:49:03 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds GUI support for compresion type. Fix half of #468.

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (7 diffs)

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -35 +35 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+//
+
+extern char *which_compression_type();
 
 extern int g_current_media_number;
@@ -2166 +2169 @@
     char *sz_size;
     char *command;
+    char *compression_type = NULL;
     char *comment;
     char *prompt;
@@ -2223 +2227 @@
                     bkpinfo->manual_cd_tray = TRUE;
                 }
+            }
+            if ((compression_type = which_compression_type()) == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
             }
             if ((bkpinfo->compression_level =
@@ -2410 +2418 @@
         }
         if (archiving_to_media) {
+            if ((compression_type = which_compression_type()) == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
@@ -2444 +2456 @@
             }
             if (!bkpinfo->restore_data) {
+                if ((compression_type = which_compression_type()) == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
@@ -2575 +2591 @@
             }
             if (archiving_to_media) {
+                if ((compression_type = which_compression_type()) == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
@@ -2732 +2752 @@
 #endif
         bkpinfo->backup_data = TRUE;
+        if (strcmp(compression_type,"lzo") == 0) {
+            strcpy(bkpinfo->zip_exe, "lzop");
+            strcpy(bkpinfo->zip_suffix, "lzo");
+        } else if (strcmp(compression_type,"gzip") == 0) {
+            strcpy(bkpinfo->zip_exe, "gzip");
+            strcpy(bkpinfo->zip_suffix, "gz");
+        //} else if (strcmp(compression_type,"lzma") == 0) {
+            //strcpy(bkpinfo->zip_exe, "xy");
+            //strcpy(bkpinfo->zip_suffix, "xy");
+        } else if (strcmp(compression_type,"bzip2") == 0) {
+            strcpy(bkpinfo->zip_exe, "bzip2");
+            strcpy(bkpinfo->zip_suffix, "bz2");
+        } else {
+            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+        }
         bkpinfo->verify_data =
             ask_me_yes_or_no