Changeset 3207 in MondoRescue for branches/3.2

Timestamp:

Dec 10, 2013, 8:49:44 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Add LZMA compression possibility through the GUI

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-verify.c (modified) (1 diff)
• common/newt-specific.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -3163 +3163 @@
     }
 
-    if (bkpinfo->netfs_remote_dir) {
+    if (bkpinfo->netfs_remote_dir != NULL) {
         // NETFS
         mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);

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

@@ -1340 +1340 @@
         }
 #ifdef __FreeBSD__
-        if (bkpinfo->netfs_remote_dir) {
+        if (bkpinfo->netfs_remote_dir != NULL) {
             // NETFS
             mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
@@ -1352 +1352 @@
         mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        if (bkpinfo->netfs_remote_dir) {
+        if (bkpinfo->netfs_remote_dir != NULL) {
             // NETFS
             mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);

branches/3.2/mondo/src/common/libmondo-verify.c

@@ -1038 +1038 @@
         fatal_error("No iso filename preparation possible");
     }
-    if (bkpinfo->netfs_remote_dir) {
+    if (bkpinfo->netfs_remote_dir != NULL) {
         // NETFS
         mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);

branches/3.2/mondo/src/common/newt-specific.c

@@ -1251 +1251 @@
 /**
  * Ask the user which compression type they would like to use.
- * The choices are "bzip2", "gzip", "lzo". NULL for exit
+ * The choices are "bzip2", "gzip", "lzo", "lzma". NULL for exit
  */
     char *which_compression_type() {
@@ -1279 +1279 @@
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b3, b2, b5, NULL);
+        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
         b_res = newtRunForm(myForm);
         newtFormDestroy(myForm);

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -859 +859 @@
             log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
         }
-        if (bkpinfo->netfs_remote_dir) {
+        if (bkpinfo->netfs_remote_dir != NULL) {
             log_msg(2, "netfs_remote_dir remains %s", bkpinfo->netfs_remote_dir);
         }