Changeset 2338 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Aug 21, 2009, 1:47:12 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds LZMA support (Fix #309)
• Change

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (19 diffs)

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -100 +100 @@
         bkpinfo->media_size[j] = 650;
     }                           /* default */
-    res =
-        retrieve_switches_from_command_line(argc, argv, flag_val,
-                                            flag_set);
+    res = retrieve_switches_from_command_line(argc, argv, flag_val, flag_set);
     retval += res;
     if (!retval) {
@@ -807 +805 @@
         }
         if (bkpinfo->include_paths != NULL) {
+            mr_strip_spaces(bkpinfo->include_paths);
             log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         }
         if (bkpinfo->exclude_paths != NULL) {
+            mr_strip_spaces(bkpinfo->exclude_paths);
             log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
         }
@@ -815 +815 @@
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
-        fatal_error
-            ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
+    if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
+        fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
     }
 
@@ -825 +823 @@
         if (flag_set['I']) {
             retval++;
-            log_to_screen
-                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+            log_to_screen("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
         }
         bkpinfo->make_filelist = FALSE;
@@ -833 +830 @@
 
     if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
-        if (!flag_set['r'] && g_kernel_version <= 2.5
-            && strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
-        }
-        if (flag_set['r'] && g_kernel_version <= 2.5
-            && !strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
+        if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
+        }
+        if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
         }
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
-            log_to_screen
-                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
-        }
-
-        if (system("which cdrecord > /dev/null 2> /dev/null")
-            && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error
-                ("Please install dvdrecord/cdrecord and try again.");
+            log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+        }
+
+        if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
+            fatal_error("Please install dvdrecord/cdrecord and try again.");
         }
         if (flag_set['C']) {
             bkpinfo->cdrw_speed = atoi(flag_val['C']);
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
             if (!flag_set['L']) {
-                log_to_screen
-                    ("You must use -L with -C. Therefore I am setting it for you.");
+                log_to_screen("You must use -L with -C. Therefore I am setting it for you.");
                 flag_set['L'] = 1;
                 flag_val['L'][0] = '\0';
@@ -868 +856 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-            // log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -878 +865 @@
 
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
         }
@@ -901 +887 @@
     {
         if (! flag_set['d']) {
-            fatal_error
-                ("You need to specify a device file with -d for bootable USB device usage");
+            fatal_error("You need to specify a device file with -d for bootable USB device usage");
         }
         if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
@@ -912 +897 @@
     {
         if (flag_set['m']) {
-            fatal_error
-                ("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
+            fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
         }
         if (!flag_set['d']) {
@@ -957 +941 @@
             if (flag_set['s']) {
                 if (flag_set['t']) {
-                    fatal_error
-                        ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
+                    fatal_error("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
                 if (process_the_s_switch(flag_val['s'])) {
@@ -1175 +1158 @@
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
-            fatal_error
-                ("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
+            fatal_error("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
         }
         bkpinfo->internal_tape_block_size = itbs;
@@ -1185 +1167 @@
 //      bkpinfo->differential = atoi (flag_val['D']);
         if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
-            fatal_error
-                ("The D option should be between 1 and 9 inclusive");
+            fatal_error("The D option should be between 1 and 9 inclusive");
         }
     }
@@ -1279 +1260 @@
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
-        fatal_error
-            ("You didn't use -d to specify the backup device/directory.");
+        fatal_error("You didn't use -d to specify the backup device/directory.");
     }
 
@@ -1365 +1345 @@
         if (run_program_and_log_output("which lzop", 2)) {
             retval++;
-            log_to_screen
-                ("Please install LZOP. You can't use '-L' until you do.\n");
+            log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
         }
     }
@@ -1374 +1353 @@
         if (run_program_and_log_output("which gzip", 2)) {
             retval++;
-            log_to_screen
-                ("Please install gzip. You can't use '-G' until you do.\n");
+            log_to_screen("Please install gzip. You can't use '-G' until you do.\n");
+        }
+    }
+
+    if ((flag_set['Y']) && (! bkpinfo->restore_data)) {
+        bkpinfo->use_lzma = TRUE;
+        if (run_program_and_log_output("which lzma", 2)) {
+            retval++;
+            log_to_screen("Please install lzma. You can't use '-Y' until you do.\n");
         }
     }
@@ -1391 +1377 @@
     if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-        log_to_screen
-            ("Your kernel appears not to support vfat filesystems. I am therefore");
-        log_to_screen
-            ("using LILO instead of SYSLINUX as the media boot loader.");
+        log_to_screen("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen("using LILO instead of SYSLINUX as the media boot loader.");
     }
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-        log_to_screen
-            ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
         log_to_screen("environment correctly. Please install it.");
         fatal_error("Aborting");
@@ -1426 +1407 @@
 
     if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
-            fatal_error
-                ("The -Z switch is only valid in restore mode");
+            fatal_error("The -Z switch is only valid in restore mode");
     }
 
@@ -1466 +1446 @@
  * @return The number of problems with the command line (0 for success).
  */
-int
-retrieve_switches_from_command_line(int argc, char *argv[],
-                                    char flag_val[128][MAX_STR_LEN],
-                                    bool flag_set[128])
+int retrieve_switches_from_command_line(int argc, char *argv[], char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
     /*@ ints ** */
@@ -1486 +1463 @@
         flag_set[i] = FALSE;
     }
-    while ((opt =
-            getopt(argc, argv, MONDO_OPTIONS))
-           != -1) {
+    while ((opt = getopt(argc, argv, MONDO_OPTIONS)) != -1) {
         if (opt == '?') {
             bad_switches = TRUE;